Commit 09d79d10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-4.12-2' of git://git.lwn.net/linux 

Pull more documentation updates from Jonathan Corbet:
 "Connect the newly RST-formatted documentation to the rest; this had to
  wait until the input pull was done. There's also a few small fixes
  that wandered in"

* tag 'docs-4.12-2' of git://git.lwn.net/linux:
  doc: replace FTP URL to kernel.org with HTTPS one
  docs: update references to the device io book
  Documentation: earlycon: fix Marvell Armada 3700 UART name
  docs-rst: add input docs at main index and use kernel-figure
parents e47b40a2 25a0da73

Documentation/admin-guide/README.rst

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ If something goes wrong 
   as is, otherwise you will have to use the ``ksymoops`` program to make

   sense of the dump (but compiling with CONFIG_KALLSYMS is usually preferred).

   This utility can be downloaded from

   ftp://ftp.<country>.kernel.org/pub/linux/utils/kernel/ksymoops/ .

   https://www.kernel.org/pub/linux/utils/kernel/ksymoops/ .

   Alternatively, you can do the dump lookup by hand:



 - In debugging dumps like the above, it helps enormously if you can

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ 
			A valid base address must be provided, and the serial

			port must already be setup and configured.



		armada3700_uart,<addr>

		ar3700_uart,<addr>

			Start an early, polled-mode console on the

			Armada 3700 serial port at the specified

			address. The serial port must already be setup

Documentation/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ needed). 
   driver-api/index

   core-api/index

   media/index

   input/index

   gpu/index

   security/index

   sound/index

Documentation/input/ff.rst

+2 −2
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ See <uapi/linux/input.h> for a description of the ff_effect struct. You 
should also find help in a few sketches, contained in files shape.svg

and interactive.svg:



.. figure:: shape.svg

.. kernel-figure:: shape.svg



    Shape



.. figure:: interactive.svg

.. kernel-figure:: interactive.svg



    Interactive

Documentation/memory-barriers.txt

+2 −2
Original line number Diff line number Diff line
@@ -2373,7 +2373,7 @@ is performed: 
					spin_unlock(Q);





See Documentation/DocBook/deviceiobook.tmpl for more information.

See Documentation/driver-api/device-io.rst for more information.





=================================
@@ -2614,7 +2614,7 @@ might be needed: 
     relaxed memory access properties, then _mandatory_ memory barriers are

     required to enforce ordering.



See Documentation/DocBook/deviceiobook.tmpl for more information.

See Documentation/driver-api/device-io.rst for more information.





INTERRUPTS