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

2019-08-13 Thread Paul E. McKenney
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

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

2019-08-13 Thread Rafael J. Wysocki
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

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

2019-08-12 Thread Stephen Rothwell
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 limitati