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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/base/power/runtime.c
index 50def99df970,45a8fbe6987a..000000000000
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@@ -1642,9 -1640,8 +1642,9 @@@ void pm_runtime_clean_up_links(struct d
  
  	idx = device_links_read_lock();
  
 -	list_for_each_entry_rcu(link, &dev->links.consumers, s_node) {
 +	list_for_each_entry_rcu(link, &dev->links.consumers, s_node,
 +				device_links_read_lock_held()) {
- 		if (link->flags & DL_FLAG_STATELESS)
+ 		if (!(link->flags & DL_FLAG_MANAGED))
  			continue;
  
  		while (refcount_dec_not_one(&link->rpm_active))