diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-09 19:45:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-09 19:45:57 -0500 |
| commit | ed3c4dff8d20e181b7f5d07f59b7d8ef3644f9a7 (patch) | |
| tree | 535219bb46fa08621004aff6052d89bf1055c549 | |
| parent | cfc79ae844d835b6eda5de199dd08c84cc4e6087 (diff) | |
| parent | ff690eeed804f112242f9a0614eafdf559f9276a (diff) | |
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.py | 3 |
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 | |||
| 36 | 36 | ||
| 37 | from docutils import nodes, statemachine | 37 | from docutils import nodes, statemachine |
| 38 | from docutils.statemachine import ViewList | 38 | from docutils.statemachine import ViewList |
| 39 | from docutils.parsers.rst import directives | 39 | from docutils.parsers.rst import directives, Directive |
| 40 | from sphinx.util.compat import Directive | ||
| 41 | from sphinx.ext.autodoc import AutodocReporter | 40 | from sphinx.ext.autodoc import AutodocReporter |
| 42 | 41 | ||
| 43 | __version__ = '1.0' | 42 | __version__ = '1.0' |