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

From	Daniel Borkmann <daniel@iogearbox.net>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the net-next tree with the net tree
Date	2016-03-04 03:20 +0100
Message-ID	<r8Nvs-85i-7@gated-at.bofh.it> (permalink)
References	<r8Nvs-85i-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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!

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-04 03:20 +0100
  Re: linux-next: manual merge of the net-next tree with the net tree Daniel Borkmann <daniel@iogearbox.net> - 2016-03-04 03:20 +0100

csiph-web