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

From: Andy Shevchenko <[email-masked]>
Date: Mon, 10 Dec 2018 11:02:57 +0200

On Mon, Dec 10, 2018 at 09:58:53AM +0100, Rafael J. Wysocki wrote:
> On Monday, December 10, 2018 6:14:54 AM CET Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in:
> > 
> >   drivers/base/platform.c
> > u
> > between commit:
> > 
> >   2d51ac9086fd ("driver core: platform: Remove duplicated device_remove_properties() call")
> > 
> > from the pm tree and commit:
> > 
> >   99fef587ff98 ("driver core: platform: Respect return code of platform_device_register_full()")
> > 
> > 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.
> 
> The fix looks good to me, thank you!

Confirm, the result looks as it supposed to be.
Thanks!

-- 
With Best Regards,
Andy Shevchenko