Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/bridge/br_mdb.c
between commit:
5ebc784625ea ("bridge: mdb: fix double add notification")
from the net tree and commit:
09cf0211f970 ("bridge: mdb: fill state in br_mdb_notify")
from the net-next tree.
I fixed it up (I removed the br_mdb_notify call as per the former patch)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
