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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <56D8F044.4080004@iogearbox.net>
Date:	Fri, 04 Mar 2016 03:17:40 +0100
From:	Daniel Borkmann <daniel@...earbox.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Benc <jbenc@...hat.com>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

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!