Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "Three fixes for the docs build, including removing an annoying warning
  on 'make help' if sphinx isn't present"

* tag 'doc-4.8-fixes' of git://git.lwn.net/linux:
  DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1
  Documenation: update cgroup's document path
  Documentation/sphinx: do not warn about missing tools in 'make help'

diff --cc Documentation/DocBook/Makefile
index c481df33ef2150f54c84b2e8516881e8d839ef25,fb32ab85ea3abd802d8b5865e5148654ff2ae11a..64460a897f562d6fde9d2649885ab9c400e0b374
--- 1/Documentation/DocBook/Makefile
--- 2/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -16,9 -14,19 +14,17 @@@ DOCBOOKS := z8530book.xml device-driver
            genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
            80211.xml debugobjects.xml sh.xml regulator.xml \
            alsa-driver-api.xml writing-an-alsa-driver.xml \
 -          tracepoint.xml gpu.xml media_api.xml w1.xml \
 +          tracepoint.xml w1.xml \
            writing_musb_glue_layer.xml crypto-API.xml iio.xml
  
 -include Documentation/DocBook/media/Makefile
 -
+ ifeq ($(DOCBOOKS),)
+ 
+ # Skip DocBook build if the user explicitly requested no DOCBOOKS.
+ .DEFAULT:
+       @echo "  SKIP    DocBook $@ target (DOCBOOKS=\"\" specified)."
+ 
+ else
+ 
  ###
  # The build process is as follows (targets):
  #              (xmldocs) [by docproc]

diff --cc Documentation/Makefile.sphinx
Simple merge

diff --cc Documentation/cgroup-v1/memcg_test.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Documentation/vm/page_migration
Simple merge

diff --cc Documentation/vm/unevictable-lru.txt
Simple merge