On 09/05/2013 07:19 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 2d98c29b6fb3 ("net: bridge: convert MLDv2 Query MRC into msecs_to_jiffies for max_delay") from Linus' tree and commit e3f5b17047de ("net: ipv6: mld: get rid of MLDV2_MRC and simplify calculation") from the net-next tree. I just used the net-next tree version and can carry the fix as necessary (no action is required).
Sounds good thanks Stephen! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
