From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Paul E. McKenney" <paulmck@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Saravana Kannan <saravanak@google.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the rcu tree
Date: Fri, 10 Feb 2023 08:18:47 +0100 [thread overview]
Message-ID: <Y+Xv17dLRGZoqUXr@kroah.com> (raw)
In-Reply-To: <20230210124818.2caaa77f@canb.auug.org.au>
On Fri, Feb 10, 2023 at 12:48:18PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/core.c
>
> between commit:
>
> dc7c31b07ade ("drivers/base: Remove CONFIG_SRCU")
>
> from the rcu tree and commit:
>
> 3a2dbc510c43 ("driver core: fw_devlink: Don't purge child fwnode's consumer links")
>
> 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.
Fix looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2023-02-10 7:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 1:48 linux-next: manual merge of the driver-core tree with the rcu tree Stephen Rothwell
2023-02-10 6:55 ` Paul E. McKenney
2023-02-10 7:18 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-13 5:50 Stephen Rothwell
2019-08-13 8:50 ` Rafael J. Wysocki
2019-08-13 14:22 ` Paul E. McKenney
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=Y+Xv17dLRGZoqUXr@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=saravanak@google.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).