On 07/30/2015 04:10 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/bridge/br_multicast.c > > between commit: > > 544586f742b4 ("bridge: mcast: give fast leave precedence over multicast router and querier") > > from the net tree and commit: > > 09cf0211f970 ("bridge: mdb: fill state in br_mdb_notify") > > from the net-next tree. > > I fixed it up (hopefully - see below) and can carry the fix as necessary > (no action is required). > Right, looks good. Thank you! -- 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