[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20160225.113607.876401940894301137.davem@davemloft.net>
Date: Thu, 25 Feb 2016 11:36:07 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: daniel@...earbox.net
Cc: alexei.starovoitov@...il.com, tgraf@...g.ch, jesse@...nel.org,
netdev@...r.kernel.org
Subject: Re: [PATCH net] bpf: fix csum setting for bpf_set_tunnel_key
From: Daniel Borkmann <daniel@...earbox.net>
Date: Thu, 25 Feb 2016 11:45:47 +0100
> On 02/24/2016 10:24 PM, David Miller wrote:
> [...]
>> Applied to 'net', thanks Daniel.
>
> Thanks!
>
> Btw, in case net gets merged into net-next, there will be a minor
> merge conflict due to stackid flags present in net-next. This can
> be easily resolved by keeping both chunks.
>
> For example, result after merge in include/uapi/linux/bpf.h then
> looks like:
...
Thanks for the heads up.
Powered by blists - more mailing lists