From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Mar 2017 19:32:18 +0000 (-0800)
Subject: Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux
X-Git-Tag: v4.11-rc1~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=be834aafdf5f8a37c191e697ac8ee6d53ab5020c;p=linux.git

Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux

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
---

be834aafdf5f8a37c191e697ac8ee6d53ab5020c
diff --cc Documentation/DocBook/Makefile
index 60a17b7da834,c339cf59ad69..164c1c76971f
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -11,8 -11,8 +11,8 @@@ DOCBOOKS := z8530book.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),)