On 01/24/2018 11:19 AM, Robert Schwebel wrote: > The kernel documentation is now restructured text. Convert the SocketCAN > documentation and include it in the toplevel kernel documentation. > > This patch doesn't do any content change. > > All references to can.txt in the code are converted to can.rst. > > Signed-off-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx> This fails to apply on next-next/master. v4.15-rc7 was working though and git rebase did the work. Use net-next/master as a base in the future. > --- > .../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 +- > 9 files changed, 1443 insertions(+), 1315 deletions(-) > create mode 100644 Documentation/networking/can.rst > delete mode 100644 Documentation/networking/can.txt > > diff --git a/Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt b/Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt > index 4ccb2cd5df94..418d0baae2e9 100644 > --- a/Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt > +++ b/Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt > @@ -195,4 +195,4 @@ External interrupts: > > fsl,mpc5200-mscan nodes > ----------------------- > -See file can.txt in this directory. > +See file can.rst in this directory. This is wrong since a long time. I've fixed this in an individual patch. Otherwise applied. Thanks, Marc -- 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:
signature.asc
Description: OpenPGP digital signature
