From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 14 Jan 2022 18:22:06 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n8QH8-002ErH-S0 for lore@lore.pengutronix.de; Fri, 14 Jan 2022 18:22:06 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n8QH7-0008BW-Jb for lore@pengutronix.de; Fri, 14 Jan 2022 18:22:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:Cc:To:Subject:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=hXGAyiqf0gD3rlGUMPvYhCa+eS4BcFqWMTxGx1meAHo=; b=a+1CapZad1FOB7/ybPD2ufr7+7 I0vwKL0mnEoT7xZPgXcWX0VNt8ABs0tbRyW+NUbbkISpyHjY7Aop5k0ZiHwJlhTyel2K1m90uHli0 bG+S4CJP0QdVbvIAklcxysOwLgrxaKxew6UXI2NRybTyVe3Ay20kjVZnRqGDZPG0K2UpqdyQfddNa zAQpX5V1yDQnRmHNpQ1M5u48mjgSBHGblaKf9hgpFeAqQy8ldQ83TvupomNBMWgGYQ48nICPCiZ1b yIzGwq2fz5r9Hd1f669TGlZS3asIaDFzdTjoXfRIQhkCdwU28KZa1y54XZyJu41gXDYn+71OZZ7In 2jgXB1lA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8QFr-009uzy-MW; Fri, 14 Jan 2022 17:20:47 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8QFn-009uza-0i for barebox@lists.infradead.org; Fri, 14 Jan 2022 17:20:44 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1n8QFi-00082z-4R; Fri, 14 Jan 2022 18:20:38 +0100 From: Ahmad Fatoum To: Jules Maselbas Cc: barebox@lists.infradead.org, Clement Leger , Louis Morhet , Luc Michel , Yann Sionneau , Clement Leger References: <20220114165208.9980-1-jmaselbas@kalray.eu> <20220114165456.10542-1-jmaselbas@kalray.eu> <20220114171111.GC29876@tellis.lin.mbt.kalray.eu> Message-ID: <414be7ce-3abd-115e-71d9-4cae945e7b3b@pengutronix.de> Date: Fri, 14 Jan 2022 18:20:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20220114171111.GC29876@tellis.lin.mbt.kalray.eu> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220114_092043_122436_147C3635 X-CRM114-Status: GOOD ( 22.15 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 10/13] drivers: add soc hierarchy properly X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On 14.01.22 18:11, Jules Maselbas wrote: > On Fri, Jan 14, 2022 at 06:06:34PM +0100, Ahmad Fatoum wrote: >> Hello Jules, >> >> On 14.01.22 17:54, Jules Maselbas wrote: >>> From: Clement Leger >>> >>> We will add kvx driver in this folder to create a proper hierarchy. >> >> This won't apply cleanly. You need to rebase. Sorry, my pattern matching was too eager. You only add drivers/soc/Kconfig, not drivers/soc/Makefile. The latter was added only recently. > On master ? Or should I wait for 2022.01.0 ? At release time, Sascha tags master and then merges next into master. Then for a month patches are applied onto next and only fixes are cherry-picked to master until next release, so patches rebased on next are least likely to conflict. Given that most arch/kvx stuff you touch wasn't updated in the meantime, I guess you don't need to rebase. Sorry for the confusion! Cheers, Ahmad >> >>> >>> Signed-off-by: Clement Leger >>> Signed-off-by: Jules Maselbas >>> --- >>> drivers/Kconfig | 2 +- >>> drivers/soc/Kconfig | 5 +++++ >>> 2 files changed, 6 insertions(+), 1 deletion(-) >>> create mode 100644 drivers/soc/Kconfig >>> >>> diff --git a/drivers/Kconfig b/drivers/Kconfig >>> index dbdf3c06f5..d66714af9a 100644 >>> --- a/drivers/Kconfig >>> +++ b/drivers/Kconfig >>> @@ -42,7 +42,7 @@ source "drivers/fpga/Kconfig" >>> source "drivers/phy/Kconfig" >>> source "drivers/crypto/Kconfig" >>> source "drivers/memory/Kconfig" >>> -source "drivers/soc/imx/Kconfig" >>> +source "drivers/soc/Kconfig" >>> source "drivers/nvme/Kconfig" >>> source "drivers/ddr/Kconfig" >>> source "drivers/power/Kconfig" >>> diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig >>> new file mode 100644 >>> index 0000000000..d78f13f3f8 >>> --- /dev/null >>> +++ b/drivers/soc/Kconfig >>> @@ -0,0 +1,5 @@ >>> +menu "SoC drivers" >>> + >>> +source "drivers/soc/imx/Kconfig" >>> + >>> +endmenu >>> >> >> >> -- >> Pengutronix e.K. | | >> Steuerwalder Str. 21 | http://www.pengutronix.de/ | >> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | >> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | >> >> >> To declare a filtering error, please use the following link : https://www.security-mail.net/reporter.php?mid=9c47.61e1ad9d.ae4c.0&r=jmaselbas%40kalray.eu&s=a.fatoum%40pengutronix.de&o=Re%3A+%5BPATCH+10%2F13%5D+drivers%3A+add+soc+hierarchy+properly&verdict=C&c=835ed3aa69d359c0f8acda9912ca30b77899cc91 >> > > > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox