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")
>
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
