Hi Stephen,
greg@xxxxxxxxx wrote on Tue, 11 Apr 2023 09:33:30 +0200:
> On Tue, Apr 11, 2023 at 01:57:28PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> > drivers/of/Makefile
> >
> > between commit:
> >
> > bac06718990c ("of: Move CPU node related functions to their own file")
> >
> > from the devicetree tree and commit:
> >
> > bd7a7ed774af ("of: Move of_modalias() to module.c")
> >
> > from the char-misc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc drivers/of/Makefile
> > index 10f704592561,ae9923fd2940..000000000000
> > --- a/drivers/of/Makefile
> > +++ b/drivers/of/Makefile
> > @@@ -1,5 -1,5 +1,5 @@@
> > # SPDX-License-Identifier: GPL-2.0
> > - obj-y = base.o cpu.o device.o platform.o property.o
> > -obj-y = base.o device.o module.o platform.o property.o
> > ++obj-y = base.o cpu.o device.o module.o platform.o property.o
> > obj-$(CONFIG_OF_KOBJ) += kobj.o
> > obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
> > obj-$(CONFIG_OF_FLATTREE) += fdt.o
>
>
> Merge looks good to me, thanks!
Agreed :)
Thanks,
Miquèl
