From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FFB8C76190 for ; Mon, 15 Jul 2019 07:57:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6957214C6 for ; Mon, 15 Jul 2019 07:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563177442; bh=mroLkCCn2tDhUBkSu/vA39E++KpXetGzGIWhdAxd0ts=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=BNwSx2RS0P4l0uEyyil0wIn/8heShPNz75ktSUEynkvKqzfSkwSXyL9iAOVAJSgpS wloaRB2qzV4JQcDlfJJNHjQ6rjLiQzSUg8dU1+eoLgLGBONE+i1PvhZWI3KbuUGk7Q L0NOua/jIfjL6qL4sY9pbwb3+jmIonNFV4ahhPMs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729403AbfGOH5W (ORCPT ); Mon, 15 Jul 2019 03:57:22 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:34870 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726170AbfGOH5V (ORCPT ); Mon, 15 Jul 2019 03:57:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To: From:Date:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eJlbjim1fxU57ZaVX/VVgKi/dG9GtJerPxx9UJo7Fww=; b=JcDzLwBGAR3DIQ5PzjliPmdfB wt3f3sg2z3AO/OuERhsRmMQS2qwxDHfr81HUZ8bO4iiwRmK3RrOm2h4/5DNGgtFEZDvuz7A8dJNNm 8SC+KQ1Nwm9BOBk47L69bPbiRtcflOhdeLDtFR53AOVtvZ10BSu6RTR+jOSoexCb+TOn62JzVO7/Z O55lv0FaRBBJ2LYyXSZdelp0ocAQap0NW6KHdOxn0lTVtf8TDPBJOZV7LLeVVU8RcXQa7O955vRo5 mleM8mlHWSbuEWzj/LK75trdO7CY3hdfI2sN1X09S7ln7kgJuHQUi7kWjs9YHKWyAOp1nM2lXWTrS FqvVaEtvQ==; Received: from [189.27.46.152] (helo=coco.lan) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hmvrD-0003qC-8d; Mon, 15 Jul 2019 07:57:11 +0000 Date: Mon, 15 Jul 2019 04:57:02 -0300 From: Mauro Carvalho Chehab To: Markus Heiser Cc: Linux Doc Mailing List , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet , Herbert Xu , "David S. Miller" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Sean Paul , Dmitry Torokhov , Yoshinori Sato , Rich Felker , Jaroslav Kysela , Takashi Iwai , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, linux-crypto@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-sh@vger.kernel.org, alsa-devel@alsa-project.org Subject: Re: [PATCH 8/8] docs: remove extra conf.py files Message-ID: <20190715045702.1e2b569b@coco.lan> In-Reply-To: References: <12a160afc9e70156f671010bd4ccff9311acdc5e.1563115732.git.mchehab+samsung@kernel.org> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Em Mon, 15 Jul 2019 08:16:54 +0200 Markus Heiser escreveu: > Hi Mauro, > > sorry, I havn't tested your patch, but one question ... > > Am 14.07.19 um 17:10 schrieb Mauro Carvalho Chehab: > > Now that the latex_documents are handled automatically, we can > > remove those extra conf.py files. > > We need these conf.py also for compiling books' into HTML. For this > the tags.add("subproject") is needed. Should we realy drop this feature? > > -- Markus -- You're right: adding "subproject" tags is needed for html. Folding this to patch 7/8 makes both htmldocs and pdfdocs to work with SPHINXDIRS without the need of a per-subdir conf.py. Regards, Mauro diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx/load_config.py index 75f527ff4c95..e4a04f367b41 100644 --- a/Documentation/sphinx/load_config.py +++ b/Documentation/sphinx/load_config.py @@ -51,3 +51,7 @@ def loadConfig(namespace): execfile_(config_file, config) del config['__file__'] namespace.update(config) + else: + config = namespace.copy() + config['tags'].add("subproject") + namespace.update(config) Thanks, Mauro