Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Mar 2017 19:32:18 +0000 (11:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Mar 2017 19:32:18 +0000 (11:32 -0800)
Pull documentation fixes from Jonathan Corbet:
 "A few fixes for the docs tree, including one for a 4.11 build
  regression"

* tag 'docs-4.11-fixes' of git://git.lwn.net/linux:
  Documentation/sphinx: fix primary_domain configuration
  docs: Fix htmldocs build failure
  doc/ko_KR/memory-barriers: Update control-dependencies section
  pcieaer doc: update the link
  Documentation: Update path to sysrq.txt

1  2 
Documentation/DocBook/Makefile

index 60a17b7da83440abde40b3aabfce4c330da29f4b,c339cf59ad6930b26598655f189df8d7d9c78edd..164c1c76971f0962cf3a44bf9bc3afd4876597bb
@@@ -7,12 -7,12 +7,12 @@@
  # list of DOCBOOKS.
  
  DOCBOOKS := z8530book.xml  \
-           kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
+           kernel-hacking.xml kernel-locking.xml \
            writing_usb_driver.xml networking.xml \
            kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
            gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
 -          genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
 +          genericirq.xml s390-drivers.xml scsi.xml \
-           sh.xml regulator.xml w1.xml \
+           sh.xml w1.xml \
            writing_musb_glue_layer.xml
  
  ifeq ($(DOCBOOKS),)