lkml.org 
[lkml]   [2019]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the driver-core tree with the rcu tree
On Tue, Aug 13, 2019 at 10:50:05AM +0200, Rafael J. Wysocki wrote:
> 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!

Same here, and thank you!

Thanx, Paul

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