From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nikolay Aleksandrov <nikolay@cumulusnetworks.com>,
mingo@kernel.org
Subject: Re: linux-next: manual merge of the rcu tree with the net-next tree
Date: Mon, 10 Dec 2018 11:21:17 -0800 [thread overview]
Message-ID: <20181210192117.GY4170@linux.ibm.com> (raw)
In-Reply-To: <20181207154707.35322397@canb.auug.org.au>
On Fri, Dec 07, 2018 at 03:47:07PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rcu tree got conflicts in:
>
> net/bridge/br_mdb.c
> net/bridge/br_multicast.c
>
> between commits:
>
> 19e3a9c90c53 ("net: bridge: convert multicast to generic rhashtable")
> 4329596cb10d ("net: bridge: multicast: use non-bh rcu flavor")
>
> from the net-next tree and commit:
>
> 1a56f7d53b5c ("net/bridge: Replace call_rcu_bh() and rcu_barrier_bh()")
>
> from the rcu tree.
>
> I fixed it up (I used the versions form net-next) 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.
This one is already in -tip, so there is no time like the present to
notify my upstream maintainer, who I have added on CC.
Ingo, I agree with Stephen's analysis, so please feel free to revert
1a56f7d53b5c ("net/bridge: Replace call_rcu_bh() and rcu_barrier_bh()").
Or let me know if some other approach would be preferable.
I really did get an Acked-by, but perhaps my long development cycles for
RCU-related patches resulted in this being lost or forgotten. Been
there myself... ;-)
Thanx, Paul
next prev parent reply other threads:[~2018-12-10 19:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 4:47 linux-next: manual merge of the rcu tree with the net-next tree Stephen Rothwell
2018-12-10 19:21 ` Paul E. McKenney [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-15 5:25 Stephen Rothwell
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=20181210192117.GY4170@linux.ibm.com \
--to=paulmck@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.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).