From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Feb 2017 02:51:29 +0000 (-0800)
Subject: Merge tag 'docs-4.11' of git://git.lwn.net/linux
X-Git-Tag: v4.11-rc1~108
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c1aac62f36c1e37ee81c9e09ee9ee733eef05dcb;p=users%2Fwilly%2Fxarray.git

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

Pull documentation updates from Jonathan Corbet:
 "A slightly quieter cycle for documentation this time around.

  Three more DocBook template files have been converted to RST; only 21
  to go. There are various build improvements and the usual array of
  documentation improvements and fixes"

* tag 'docs-4.11' of git://git.lwn.net/linux: (44 commits)
  docs / driver-api: Fix structure references in device_link.rst
  PM / docs: Fix structure references in device.rst
  Add a target to check broken external links in the Documentation
  Documentation: Fix linux-api list typo
  Documentation: DocBook/Makefile comment typo
  Improve sparse documentation
  Documentation: make Makefile.sphinx no-ops quieter
  Documentation: DMA-ISA-LPC.txt
  Documentation: input: fix path to input code definitions
  docs: Remove the copyright year from conf.py
  docs: Fix a warning in the Korean HOWTO.rst translation
  PM / sleep / docs: Convert PM notifiers document to reST
  PM / core / docs: Convert sleep states API document to reST
  PM / core: Update kerneldoc comments in pm.h
  doc-rst: Fix recursive make invocation from macros
  doc-rst: Delete output of failed dot-SVG conversion
  doc-rst: Break shell command sequences on failure
  Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0
  doc-rst: fixed cleandoc target when used with O=dir
  Documentation/sphinx: prevent generation of .pyc files in the source tree
  ...
---

c1aac62f36c1e37ee81c9e09ee9ee733eef05dcb
diff --cc Documentation/DocBook/Makefile
index 5fd8f5effd0c,7b8831fb4e37..60a17b7da834
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -11,9 -11,9 +11,9 @@@ 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 \
- 	    writing_musb_glue_layer.xml iio.xml
+ 	    writing_musb_glue_layer.xml
  
  ifeq ($(DOCBOOKS),)