lkml.org 
[lkml]   [2019]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the driver-core tree with the rcu tree
From
Date
On 8/13/2019 7:50 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/power/runtime.c
>
> between commit:
>
> 4a3a5474b4c1 ("driver/core: Convert to use built-in RCU list checking")
>
> from the rcu tree and commit:
>
> 515db266a9da ("driver core: Remove device link creation limitation")
>
> 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, thanks!


\
 
 \ /
  Last update: 2019-08-13 11:17    [W:0.021 / U:9.284 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site