From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:56554 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751361AbeCLPlA (ORCPT ); Mon, 12 Mar 2018 11:41:00 -0400 Subject: Patch "Documentation/sphinx: Fix Directive import error" has been added to the 4.14-stable tree To: mawilcox@microsoft.com, corbet@lwn.net, gregkh@linuxfoundation.org, jani.nikula@intel.com, tiwai@suse.de Cc: , From: Date: Mon, 12 Mar 2018 16:40:43 +0100 Message-ID: <1520869243136245@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Documentation/sphinx: Fix Directive import error to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: documentation-sphinx-fix-directive-import-error.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ff690eeed804f112242f9a0614eafdf559f9276a Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Fri, 2 Mar 2018 10:40:14 -0800 Subject: Documentation/sphinx: Fix Directive import error From: Matthew Wilcox 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 Acked-by: Jani Nikula Cc: stable@vger.kernel.org Signed-off-by: Matthew Wilcox Signed-off-by: Jonathan Corbet Signed-off-by: Greg Kroah-Hartman --- 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' Patches currently in stable-queue which might be from mawilcox@microsoft.com are queue-4.14/documentation-sphinx-fix-directive-import-error.patch