lkml.org 
[lkml]   [2018]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the driver-core tree with the pm tree
Date
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!

\
 
 \ /
  Last update: 2018-12-10 10:00    [W:0.026 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site