From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: 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 10:50:05 +0200 [thread overview]
Message-ID: <0d7ff624-dce3-3961-b9a6-7de8eba2bdee@intel.com> (raw)
In-Reply-To: <20190813155048.59dd9bdf@canb.auug.org.au>
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!
next prev parent reply other threads:[~2019-08-13 9:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2019-08-13 14:22 ` Paul E. McKenney
2023-02-10 1:48 Stephen Rothwell
2023-02-10 6:55 ` Paul E. McKenney
2023-02-10 7:18 ` Greg KH
Reply instructions:
You may reply publicly 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=0d7ff624-dce3-3961-b9a6-7de8eba2bdee@intel.com \
--to=rafael.j.wysocki@intel.com \
--cc=greg@kroah.com \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).