On 02/21/2018 05:33 PM, Daniel Borkmann wrote: > Hi Shuah, > > On 02/22/2018 12:03 AM, Shuah Khan wrote: >> On 02/21/2018 03:48 PM, David Miller wrote: >>> From: Anders Roxell <anders.rox...@linaro.org> >>> Date: Wed, 21 Feb 2018 22:30:01 +0100 >>> >>>> bpf builds a test program for loading BPF ELF files. Add the executable >>>> to the .gitignore list. >>>> >>>> Signed-off-by: Anders Roxell <anders.rox...@linaro.org> >>> >>> Acked-by: David S. Miller <da...@davemloft.net> >> >> Thanks. I will pull this in for 4.16-rc > > I would have taken this into bpf tree, but fair enough. This one > in particular doesn't cause any conflicts right now, so feel free > to pick it up then. But usual paths are via bpf / bpf-next as we > otherwise would run into real ugly merge conflicts. >
Daniel, Go for it. I know bpf tree stuff causes conflicts. That is why I usually stay away from bpfs selftests and let you handle them. You are taking the other one away, pick this up as well. Acked-by: Shuah Khan <shua...@osg.samsung.com> thanks, -- Shuah
