LKML Archive on
 help / color / Atom feed
* linux-next: manual merge of the driver-core tree with the rcu tree
@ 2019-08-13  5:50 Stephen Rothwell
  2019-08-13  8:50 ` Rafael J. Wysocki
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-08-13  5:50 UTC (permalink / raw)
  To: Greg KH, Paul E. McKenney
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Joel Fernandes (Google),
	Rafael J. Wysocki

[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:


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.

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))
  		while (refcount_dec_not_one(&link->rpm_active))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-13  5:50 linux-next: manual merge of the driver-core tree with the rcu tree Stephen Rothwell
2019-08-13  8:50 ` Rafael J. Wysocki
2019-08-13 14:22   ` Paul E. McKenney

LKML Archive on

Archives are clonable:
	git clone --mirror lkml/git/0.git
	git clone --mirror lkml/git/1.git
	git clone --mirror lkml/git/2.git
	git clone --mirror lkml/git/3.git
	git clone --mirror lkml/git/4.git
	git clone --mirror lkml/git/5.git
	git clone --mirror lkml/git/6.git
	git clone --mirror lkml/git/7.git
	git clone --mirror lkml/git/8.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ \
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone