LKML Archive on
 help / color / Atom feed
From: "Paul E. McKenney" <>
To: "Rafael J. Wysocki" <>
Cc: Stephen Rothwell <>, Greg KH <>,
	Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	"Joel Fernandes (Google)" <>
Subject: Re: linux-next: manual merge of the driver-core tree with the rcu tree
Date: Tue, 13 Aug 2019 07:22:59 -0700
Message-ID: <> (raw)
In-Reply-To: <>

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

      reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-13  5:50 Stephen Rothwell
2019-08-13  8:50 ` Rafael J. Wysocki
2019-08-13 14:22   ` Paul E. McKenney [this message]

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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

	# 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