From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Subject: linux-next: manual merge of the rcu tree with the net-next tree
Date: Fri, 7 Dec 2018 15:47:07 +1100 [thread overview]
Message-ID: <20181207154707.35322397@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-12-07 4:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 4:47 Stephen Rothwell [this message]
2018-12-10 19:21 ` linux-next: manual merge of the rcu tree with the net-next tree Paul E. McKenney
-- 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=20181207154707.35322397@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=paulmck@linux.vnet.ibm.com \
/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).