summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-03-09 16:45:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-03-09 16:45:57 -0800
commited3c4dff8d20e181b7f5d07f59b7d8ef3644f9a7 (patch)
tree535219bb46fa08621004aff6052d89bf1055c549
parentcfc79ae844d835b6eda5de199dd08c84cc4e6087 (diff)
parentff690eeed804f112242f9a0614eafdf559f9276a (diff)
downloadlinux-ed3c4dff8d20e181b7f5d07f59b7d8ef3644f9a7.tar.bz2
Merge tag 'docs-4.16-fix' of git://git.lwn.net/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
-rw-r--r--Documentation/sphinx/kerneldoc.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py
index 39aa9e8697cc..fbedcc39460b 100644
--- a/Documentation/sphinx/kerneldoc.py
+++ b/Documentation/sphinx/kerneldoc.py
@@ -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'