Le 02/02/2015 03:33, Stephen Rothwell a écrit :
Hi all,Today's linux-next merge of the net-next tree got a conflict in drivers/net/vxlan.c between commit 33564bbb2cf1 ("vxlan: setup the right link netns in newlink hdlr") from the net tree and commit ac5132d1a03f ("vxlan: Only bind to sockets with compatible flags enabled") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required).
Acked-by: Nicolas Dichtel <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
