| Message ID | 20180221213001.18682-1-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 31a8260d3e34aaddf821388b8e0d589f44401f75 |
| Headers | show |
| Series | selftests/bpf: update gitignore with test_libbpf_open | expand |
On 02/21/2018 03:30 PM, Anders Roxell wrote: > bpf builds a test program for loading BPF ELF files. Add the executable > to the .gitignore list. > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Tested-by: Daniel Díaz <daniel.diaz@linaro.org> > --- > tools/testing/selftests/bpf/.gitignore | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore > index cc15af2e54fe..9cf83f895d98 100644 > --- a/tools/testing/selftests/bpf/.gitignore > +++ b/tools/testing/selftests/bpf/.gitignore > @@ -11,3 +11,4 @@ test_progs > test_tcpbpf_user > test_verifier_log > feature > +test_libbpf_open
From: Anders Roxell <anders.roxell@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.roxell@linaro.org> Acked-by: David S. Miller <davem@davemloft.net>
On 02/21/2018 03:48 PM, David Miller wrote: > From: Anders Roxell <anders.roxell@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.roxell@linaro.org> > > Acked-by: David S. Miller <davem@davemloft.net> > > Thanks. I will pull this in for 4.16-rc -- Shuah
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.roxell@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.roxell@linaro.org> >> >> Acked-by: David S. Miller <davem@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. Thanks, Daniel
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.roxell@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.roxell@linaro.org> >>> >>> Acked-by: David S. Miller <davem@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 <shuahkh@osg.samsung.com> thanks, -- Shuah
On 02/22/2018 01:37 AM, Shuah Khan wrote: > 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.roxell@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.roxell@linaro.org> >>>> >>>> Acked-by: David S. Miller <davem@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. Okay, great, thanks for your understanding, Shuah. Just applied to bpf tree. > Acked-by: Shuah Khan <shuahkh@osg.samsung.com> > > thanks, > -- Shuah >
diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index cc15af2e54fe..9cf83f895d98 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -11,3 +11,4 @@ test_progs test_tcpbpf_user test_verifier_log feature +test_libbpf_open
bpf builds a test program for loading BPF ELF files. Add the executable to the .gitignore list. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- tools/testing/selftests/bpf/.gitignore | 1 + 1 file changed, 1 insertion(+) -- 2.11.0