From: Daniel Borkmann <dan...@iogearbox.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.
