Received: by 10.223.185.116 with SMTP id b49csp288231wrg; Fri, 2 Mar 2018 19:19:22 -0800 (PST) X-Google-Smtp-Source: AG47ELtQYgcmzn4GC6JTXG31gU3bP9fXPup5e+7+oPRIA9k5PRXAoOluVcKVWlUhpNFE11F7Sf+f X-Received: by 10.101.91.3 with SMTP id y3mr6260906pgq.149.1520047162486; Fri, 02 Mar 2018 19:19:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520047162; cv=none; d=google.com; s=arc-20160816; b=BQj1hgQP/gH+1XP6/Qa+j0r31DhRnAjBT4htSoe29pgDUew3FIJdxDlBzikfdW2QWT 3hjMhxiOH/xHNMPHLgX7RQpOPuF4H3yiaQxwT0k6cEnwufC6CP9wSIUAiJU54LETXYig W4L6cSwWexVbsqzowV7OJYthRQovDRplQDw2c/yoJCiZVbdvFmbIEwpARNZfd99C5CEA C5masHWD4sbH8LZml8ORmHVMsbVP2sJeWwDRtKM3gZUXqZ08SfO+RuvNVv9IVwr5b+49 ySOZ+lY3v5j4e3SOTeIz1+X8QnVg15+bPuPw0qfeBhab8h6yxtKzz+jLzQhW6vO7GdLX LU6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :organization:in-reply-to:subject:cc:to:from :arc-authentication-results; bh=bq2g/RGuJQOUlBanDdJf8tFvJ/r83YqNgv8ECo92fAA=; b=cPotziKP51b+qNyFDqh2bwug48TzRxSkQee99L7ij2079PaWYM+XjcGV7isE+N1quA GoEIp+r3i/4Jtp5agIZYmBwQis5OPzUEa0pjhZ2FvaNjtNhggIRiPobmZ2goguzzVDsv esyUaJYdzyAPQO0C+Fnfqpcof97dN/4VRgFovp+Gd4a76GdMavwn79CuGoFv+MoTp9HU FBQXJ9xbQr0kEIGHrjSVL59i6vXL/sRDfqV6WwnD3xBum0vgs5Iyp1fnEj1HAs45+SRi DLSEoTXyNRpDTQMLT0/ge5rdDAqfZ3/V9YDd32UDzJGgpdjxz0RajVN3NAuxcQFYdgbB Fd8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b3-v6si5801402plc.317.2018.03.02.19.19.07; Fri, 02 Mar 2018 19:19:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1428031AbeCBTBG (ORCPT + 99 others); Fri, 2 Mar 2018 14:01:06 -0500 Received: from mga04.intel.com ([192.55.52.120]:51210 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424211AbeCBTBF (ORCPT ); Fri, 2 Mar 2018 14:01:05 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2018 11:00:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,413,1515484800"; d="scan'208";a="35047675" Received: from walshcon-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.36.5]) by fmsmga001.fm.intel.com with ESMTP; 02 Mar 2018 11:00:57 -0800 From: Jani Nikula To: Matthew Wilcox , Takashi Iwai Cc: Jonathan Corbet , Jiri Slaby , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] Documentation/sphinx: Fix Directive import error In-Reply-To: <20180302184014.GG31400@bombadil.infradead.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20180302152831.11510-1-tiwai@suse.de> <20180302184014.GG31400@bombadil.infradead.org> Date: Fri, 02 Mar 2018 21:00:53 +0200 Message-ID: <87tvtyti8q.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 02 Mar 2018, Matthew Wilcox wrote: > From: Matthew Wilcox > > 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 > Signed-off-by: Matthew Wilcox I think this is the best approach. FWIW, Acked-by: Jani Nikula > > 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' -- Jani Nikula, Intel Open Source Technology Center