Re: linux-next: manual merge of the driver-core tree with the devicetree tree

[Saravana Kannan]

On Tue, Apr 6, 2021 at 2:11 AM Greg KH <greg@xxxxxxxxx> wrote:
>
> On Tue, Apr 06, 2021 at 06:19:45PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the driver-core tree got a conflict in:
> >
> >   drivers/of/property.c
> >
> > between commit:
> >
> >   3915fed92365 ("of: property: Provide missing member description and remove excess param")
> >
> > from the devicetree tree and commit:
> >
> >   f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint")
> >
> > from the driver-core 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.
>
> Change looks good to me, thanks!

LGTM too.

-Saravana