* pull-request: can-next 2018-01-26
@ 2018-01-26 10:01 Marc Kleine-Budde
2018-01-26 15:54 ` pull-request: can-next 2018-01-26,pull-request: " David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Marc Kleine-Budde @ 2018-01-26 10:01 UTC (permalink / raw)
To: netdev; +Cc: davem, kernel, linux-can
[-- Attachment #1.1: Type: text/plain, Size: 2574 bytes --]
Hello David,
this is a pull request for net-next/master consisting of 3 patches.
The first two patches target the CAN documentation. The first is by me
and fixes pointer to location of fsl,mpc5200-mscan node in the mpc5200
documentation. The second patch is by Robert Schwebel and it converts
the plain ASCII documentation to restructured text.
The third patch is by Fabrizio Castro add the r8a774[35] support to the
rcar_can dt-bindings documentation.
regards,
Marc
---
The following changes since commit 9515a2e082f91457db0ecff4b65371d0fb5d9aad:
net/ipv4: Allow send to local broadcast from a socket bound to a VRF (2018-01-25 21:51:31 -0500)
are available in the Git repository at:
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-4.16-20180126
for you to fetch changes up to 216bf2f490c214b8a0702b52cc957138ba24bc3f:
dt-bindings: can: rcar_can: document r8a774[35] can support (2018-01-26 10:47:17 +0100)
----------------------------------------------------------------
linux-can-next-for-4.16-20180126
----------------------------------------------------------------
Fabrizio Castro (1):
dt-bindings: can: rcar_can: document r8a774[35] can support
Marc Kleine-Budde (1):
Documentation/devicetree: mpc5200.txt: fix pointer to location of fsl,mpc5200-mscan node
Robert Schwebel (1):
can: migrate documentation to restructured text
.../devicetree/bindings/net/can/rcar_can.txt | 7 +-
.../devicetree/bindings/powerpc/fsl/mpc5200.txt | 2 +-
Documentation/networking/00-INDEX | 2 -
Documentation/networking/can.rst | 1437 ++++++++++++++++++++
Documentation/networking/can.txt | 1308 ------------------
Documentation/networking/index.rst | 1 +
MAINTAINERS | 2 +-
drivers/net/can/dev.c | 2 +-
drivers/net/can/vcan.c | 2 +-
net/can/Kconfig | 2 +-
10 files changed, 1448 insertions(+), 1317 deletions(-)
create mode 100644 Documentation/networking/can.rst
delete mode 100644 Documentation/networking/can.txt
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: pull-request: can-next 2018-01-26,pull-request: can-next 2018-01-26
2018-01-26 10:01 pull-request: can-next 2018-01-26 Marc Kleine-Budde
@ 2018-01-26 15:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-01-26 15:54 UTC (permalink / raw)
To: mkl; +Cc: netdev, kernel, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 26 Jan 2018 11:01:41 +0100
> this is a pull request for net-next/master consisting of 3 patches.
>
> The first two patches target the CAN documentation. The first is by me
> and fixes pointer to location of fsl,mpc5200-mscan node in the mpc5200
> documentation. The second patch is by Robert Schwebel and it converts
> the plain ASCII documentation to restructured text.
>
> The third patch is by Fabrizio Castro add the r8a774[35] support to the
> rcar_can dt-bindings documentation.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-26 15:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-26 10:01 pull-request: can-next 2018-01-26 Marc Kleine-Budde
2018-01-26 15:54 ` pull-request: can-next 2018-01-26,pull-request: " David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).