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

diff --combined Documentation/admin-guide/kernel-parameters.txt
index 238bd211f36576efacd83bf2104aa8002825b92e,230b03caee5587df8d8e5801c795437785a7b412..15f79c27748df1611b1643b77ca68e2a5e7cfaab
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -972,7 -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
@@@ -1578,15 -1578,6 +1578,15 @@@
                        extended tables themselves, and also PASID support. With
                        this option set, extended tables will not be used even
                        on hardware which claims to support them.
 +              tboot_noforce [Default Off]
 +                      Do not force the Intel IOMMU enabled under tboot.
 +                      By default, tboot will force Intel IOMMU on, which
 +                      could harm performance of some high-throughput
 +                      devices like 40GBit network cards, even if identity
 +                      mapping is enabled.
 +                      Note that using this option lowers the security
 +                      provided by tboot because it makes the system
 +                      vulnerable to DMA attacks.
  
        intel_idle.max_cstate=  [KNL,HW,ACPI,X86]
                        0       disables intel_idle and fall back on acpi_idle.
@@@ -1653,12 -1644,6 +1653,12 @@@
                nobypass        [PPC/POWERNV]
                        Disable IOMMU bypass, using IOMMU for PCI devices.
  
 +      iommu.passthrough=
 +                      [ARM64] Configure DMA to bypass the IOMMU by default.
 +                      Format: { "0" | "1" }
 +                      0 - Use IOMMU translation for DMA.
 +                      1 - Bypass the IOMMU for DMA.
 +                      unset - Use IOMMU translation for DMA.
  
        io7=            [HW] IO7 for Marvel based alpha systems
                        See comment before marvel_specify_io7 in
@@@ -2434,6 -2419,12 +2434,6 @@@
                        and gids from such clients.  This is intended to ease
                        migration from NFSv2/v3.
  
 -      objlayoutdriver.osd_login_prog=
 -                      [NFS] [OBJLAYOUT] sets the pathname to the program which
 -                      is used to automatically discover and login into new
 -                      osd-targets. Please see:
 -                      Documentation/filesystems/pnfs.txt for more explanations
 -
        nmi_debug=      [KNL,SH] Specify one or more actions to take
                        when a NMI is triggered.
                        Format: [state][,regs][,debounce][,die]
@@@ -3794,14 -3785,6 +3794,14 @@@
        spia_pedr=
        spia_peddr=
  
 +      srcutree.exp_holdoff [KNL]
 +                      Specifies how many nanoseconds must elapse
 +                      since the end of the last SRCU grace period for
 +                      a given srcu_struct until the next normal SRCU
 +                      grace period will be considered for automatic
 +                      expediting.  Set to zero to disable automatic
 +                      expediting.
 +
        stacktrace      [FTRACE]
                        Enabled the stack tracer on boot up.
  

diff --combined Documentation/memory-barriers.txt
index 08329cb857edc9946449ff7aa9251513daefb50e,d323adcb7b88c150b6a682e654ea6a56f827711b..732f10ea382e8e54ab78355934ec63669f59b285
--- 1/Documentation/memory-barriers.txt
--- 2/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@@ -768,7 -768,7 +768,7 @@@ equal to zero, in which case the compil
  transform the above code into the following:
  
        q = READ_ONCE(a);
 -      WRITE_ONCE(b, 1);
 +      WRITE_ONCE(b, 2);
        do_something_else();
  
  Given this transformation, the CPU is not required to respect the ordering
@@@ -2373,7 -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 +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