From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jul 2019 19:21:41 +0000 (-0700)
Subject: Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v5.3-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c309b6f24222246c18a8b65d3950e6e755440865;p=thirdparty%2Flinux.git

Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull rst conversion of docs from Mauro Carvalho Chehab:
 "As agreed with Jon, I'm sending this big series directly to you, c/c
  him, as this series required a special care, in order to avoid
  conflicts with other trees"

* tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (77 commits)
  docs: kbuild: fix build with pdf and fix some minor issues
  docs: block: fix pdf output
  docs: arm: fix a breakage with pdf output
  docs: don't use nested tables
  docs: gpio: add sysfs interface to the admin-guide
  docs: locking: add it to the main index
  docs: add some directories to the main documentation index
  docs: add SPDX tags to new index files
  docs: add a memory-devices subdir to driver-api
  docs: phy: place documentation under driver-api
  docs: serial: move it to the driver-api
  docs: driver-api: add remaining converted dirs to it
  docs: driver-api: add xilinx driver API documentation
  docs: driver-api: add a series of orphaned documents
  docs: admin-guide: add a series of orphaned documents
  docs: cgroup-v1: add it to the admin-guide book
  docs: aoe: add it to the driver-api book
  docs: add some documentation dirs to the driver-api book
  docs: driver-model: move it to the driver-api book
  docs: lp855x-driver.rst: add it to the driver-api book
  ...
---

c309b6f24222246c18a8b65d3950e6e755440865
diff --cc Documentation/index.rst
index 00a0fe4241a42,eb5db850c4ef4..70ae148ec980e
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -90,9 -96,23 +96,24 @@@ needed)
  
     driver-api/index
     core-api/index
+    locking/index
+    accounting/index
+    block/index
+    cdrom/index
+    ide/index
+    fb/index
+    fpga/index
+    hid/index
+    iio/index
 +   infiniband/index
+    leds/index
     media/index
+    netlabel/index
     networking/index
+    pcmcia/index
+    target/index
+    timers/index
+    watchdog/index
     input/index
     hwmon/index
     gpu/index
@@@ -103,8 -123,9 +124,10 @@@
     vm/index
     bpf/index
     usb/index
 +   PCI/index
     misc-devices/index
+    mic/index
+    scheduler/index
  
  Architecture-specific documentation
  -----------------------------------