Re: linux-next: manual merge of the net-next tree with Linus' tree
flat view
From: Nikolay Aleksandrov <hidden>
Date: 2015-07-14 08:23:28
Also in:
linux-next, lkml
On 07/14/2015 03:46 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/bridge/br_mdb.c
between commit:
f1158b74e54f ("bridge: mdb: zero out the local br_ip variable before use")
from Linus' tree and commit:
74fe61f17e99 ("bridge: mdb: add vlan support for user entries")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).Looks good to me, thanks Stephen! Cheers, Nik