Commit ed3c4dff authored Mar 09, 2018 by Linus Torvalds

linux

Pull Documentation build fix from Jonathan Corbet:
 "The Sphinx 1.7 release broke the build process for reasons that are
  mostly our fault.

  This is a single fix cherry-picked from docs-next that restores docs
  buildability for all supported Sphinx versions"

* tag 'docs-4.16-fix' of git://git.lwn.net/linux:
  Documentation/sphinx: Fix Directive import error

parents cfc79ae8 ff690eee

Documentation/sphinx/kerneldoc.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,7 @@ import glob

		from docutils import nodes, statemachine
		from docutils.statemachine import ViewList
		from docutils.parsers.rst import directives
		from sphinx.util.compat import Directive
		from docutils.parsers.rst import directives, Directive
		from sphinx.ext.autodoc import AutodocReporter

		__version__ = '1.0'

Admin message