LKML Archive on lore.kernel.org
 help / color / Atom feed
From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	"Joel Fernandes (Google)" <joel@joelfernandes.org>
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: <20190813142259.GZ28441@linux.ibm.com> (raw)
In-Reply-To: <0d7ff624-dce3-3961-b9a6-7de8eba2bdee@intel.com>

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20190813142259.GZ28441@linux.ibm.com \
    --to=paulmck@linux.ibm.com \
    --cc=greg@kroah.com \
    --cc=joel@joelfernandes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

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

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 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/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git