From: Sudeep Holla <sudeep.holla@arm.com>
To: Cristian Marussi <cristian.marussi@arm.com>
Cc: ye.xingchen@zte.com.cn, linux-arm-kernel@lists.infradead.org,
Sudeep Holla <sudeep.holla@arm.com>,
saravanak@google.com, arnd@arndb.de,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] firmware: arm_scmi: remove duplicate include header
Date: Thu, 23 Feb 2023 14:42:54 +0000 [thread overview]
Message-ID: <20230223144254.c3gwkagdivo3c2u2@bogus> (raw)
In-Reply-To: <Y+Yqhy3zWWOGQLSS@e120937-lin>
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 <ye.xingchen@zte.com.cn>
> >
> > linux/of.h is included more than once.
> >
> > Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
> > ---
> > 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 <linux/kernel.h>
> > #include <linux/slab.h>
> > #include <linux/device.h>
> > -#include <linux/of.h>
> >
>
> 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 <saravanak@google.com>
> 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 <cristian.marussi@arm.com>
> 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
next prev parent reply other threads:[~2023-02-23 14:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 7:20 [PATCH] firmware: arm_scmi: remove duplicate include header ye.xingchen
2023-02-10 11:29 ` Cristian Marussi
2023-02-10 20:16 ` Saravana Kannan
2023-02-23 14:42 ` Sudeep Holla [this message]
2023-03-09 14:21 ` Sudeep Holla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230223144254.c3gwkagdivo3c2u2@bogus \
--to=sudeep.holla@arm.com \
--cc=arnd@arndb.de \
--cc=cristian.marussi@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=saravanak@google.com \
--cc=ye.xingchen@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox