Re: linux-next: manual merge of the net-next tree with the net tree

[Daniel Borkmann]

On 03/04/2016 03:09 AM, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

   drivers/net/vxlan.c

between commit:

   4024fcf70556 ("vxlan: fix missing options_len update on RX with collect 
metadata")

from the net tree and commit:

   3288af0892e3 ("vxlan: move GBP header parsing to a separate function")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Looks good, thanks!