From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from ms.lwn.net ([45.79.88.28]:35658 "EHLO ms.lwn.net"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750741AbeDQPAO (ORCPT <rfc822;stable@vger.kernel.org>);
        Tue, 17 Apr 2018 11:00:14 -0400
Date: Tue, 17 Apr 2018 09:00:13 -0600
From: Jonathan Corbet <corbet@lwn.net>
To: <gregkh@linuxfoundation.org>
Cc: mawilcox@microsoft.com, jani.nikula@intel.com, tiwai@suse.de,
        <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] Documentation/sphinx: Fix Directive
 import error" failed to apply to 4.16-stable tree
Message-ID: <20180417090013.1cf67f17@lwn.net>
In-Reply-To: <1523971114409@kroah.com>
References: <1523971114409@kroah.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Tue, 17 Apr 2018 15:18:34 +0200
<gregkh@linuxfoundation.org> 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@vger.kernel.org>.

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@microsoft.com>
> 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@suse.de>
> Acked-by: Jani Nikula <jani.nikula@intel.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> 
> 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'
>