Messages in this thread | | | Date | Mon, 02 Feb 2015 10:09:30 +0100 | From | Nicolas Dichtel <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
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 <nicolas.dichtel@6wind.com>
| |