Messages in this thread Patch in this message | | | Date | Thu, 23 Feb 2023 14:42:54 +0000 | From | Sudeep Holla <> | Subject | Re: [PATCH] firmware: arm_scmi: remove duplicate include header |
| |
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
| |