On Tue, 17 Apr 2018 15:18:34 +0200 <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > The patch below does not apply to the 4.16-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <stable@xxxxxxxxxxxxxxx>. So I'm a little confused...the reason it doesn't apply (in any of 4.1[456]) is that it's already there. Not quite sure why it's coming around on the guitar again? Thanks, jon > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From 41387bb7d869e96df4b870e1880ad49f053cc755 Mon Sep 17 00:00:00 2001 > From: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> > Date: Fri, 2 Mar 2018 10:40:14 -0800 > Subject: [PATCH] Documentation/sphinx: Fix Directive import error > > 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 <tiwai@xxxxxxx> > Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> > Signed-off-by: Jonathan Corbet <corbet@xxxxxxx> > > 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' >