4.14-stable review patch. If anyone has any objections, please let me know.
------------------ From: Matthew Wilcox <mawil...@microsoft.com> commit ff690eeed804f112242f9a0614eafdf559f9276a upstream. Sphinx 1.7 removed sphinx.util.compat.Directive so people who have upgraded cannot build the documentation. Switch to docutils.parsers.rst.Directive which has been available since docutils 0.5 released in 2009. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1083694 Co-developed-by: Takashi Iwai <ti...@suse.de> Acked-by: Jani Nikula <jani.nik...@intel.com> Cc: sta...@vger.kernel.org Signed-off-by: Matthew Wilcox <mawil...@microsoft.com> Signed-off-by: Jonathan Corbet <cor...@lwn.net> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- Documentation/sphinx/kerneldoc.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- 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'
