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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4D27C61DA4 for ; Thu, 23 Feb 2023 14:44:05 +0000 (UTC) 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:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Pb/mBttVjDgf3PDMVYiP4oPZWdIjRyZaQGgFHuE/7iE=; b=g3tWmj3OCQ+lFf 2Jwn30ewlTMSuHvH5KOux67NeupBL4uC6JHVlMbLdQHR3pSpl4cdkHD09sJr9IRltfzFHmn0lGD4c J81niYqB8nz1JKbCqRrokWG/Wfeb0TJuswMdObs+lHCa2WJ5KueUA/p4qjv1l68eCzgAfIbKEYg5w W5GgC2Oaa4CJiFMYq/bnGx6f6LPsTQxuDfIh4lZQ4Wx333xHBgRxUwfeuML21DbuzEaQYVy/7eNEi b63mBYgkJ12hS/secDIS84R6vcZwLzPE2/XaOi225C0EMjkBoOHBtLfs3nPl0HlfWDD1fhX5UpaCB 1Ug+Cm2CtFhtldx1xgwg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pVCoR-00Gqrc-PI; Thu, 23 Feb 2023 14:43:11 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pVCoO-00GqpT-F4 for linux-arm-kernel@lists.infradead.org; Thu, 23 Feb 2023 14:43:10 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 205991FB; Thu, 23 Feb 2023 06:43:41 -0800 (PST) Received: from bogus (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 25FA23F881; Thu, 23 Feb 2023 06:42:57 -0800 (PST) Date: Thu, 23 Feb 2023 14:42:54 +0000 From: Sudeep Holla To: Cristian Marussi Cc: ye.xingchen@zte.com.cn, linux-arm-kernel@lists.infradead.org, Sudeep Holla , saravanak@google.com, arnd@arndb.de, linux-kernel@vger.kernel.org Subject: Re: [PATCH] firmware: arm_scmi: remove duplicate include header Message-ID: <20230223144254.c3gwkagdivo3c2u2@bogus> References: <202302101520071730986@zte.com.cn> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230223_064308_573799_A0ED91A9 X-CRM114-Status: GOOD ( 21.88 ) X-BeenThere: linux-arm-kernel@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: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Feb 10, 2023 at 11:29:11AM +0000, Cristian Marussi wrote: > On Fri, Feb 10, 2023 at 03:20:07PM +0800, ye.xingchen@zte.com.cn wrote: > > From: Ye Xingchen > > > > linux/of.h is included more than once. > > > > Signed-off-by: Ye Xingchen > > --- > > drivers/firmware/arm_scmi/bus.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c > > index 73140b854b31..b2d242178fbc 100644 > > --- a/drivers/firmware/arm_scmi/bus.c > > +++ b/drivers/firmware/arm_scmi/bus.c > > @@ -14,7 +14,6 @@ > > #include > > #include > > #include > > -#include > > > > Hi Ye, > > thanks for this. > > Looking at next-20230210 it seem like the linux/of.h include that you > removed was added by: > > commit 96da4a99ce507bb98e2ba77018a2f91999c8c12b > Author: Saravana Kannan > Date: Mon Feb 6 17:42:03 2023 -0800 > > firmware: arm_scmi: Set fwnode for the scmi_device > > ...AND indeed there was already a linux/of.h include added by a preceding > commit by myself > > commit d3cd7c525fd2ecce3a6c963f314969a54783d211 > Author: Cristian Marussi > Date: Thu Dec 22 18:50:45 2022 +0000 > > firmware: arm_scmi: Refactor protocol device creation > > ...BUT they both hit next- together so the clash. > > My series is queued for the next merge window on soc/, not sure about the > state of Saravana series, but if that series will be queued too for v6.3 > we'll need to pick up your fix indeed, Ye. > > Probably better to wait and pick it up in v6.3-rc1 once the situation > will be more clear as what is going in. > > Up to Sudeep anyway the choice. > Yes I will pick this up once we have the issue(i.e. both the above commit) in the main upstream branch. -- Regards, Sudeep _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel