diff mbox series

selftests: bpf: update .gitignore with missing file

Message ID 20180423135057.951-1-anders.roxell@linaro.org
State New
Headers show
Series selftests: bpf: update .gitignore with missing file | expand

Commit Message

Anders Roxell April 23, 2018, 1:50 p.m. UTC
Fixes: c0fa1b6c3efc ("bpf: btf: Add BTF tests")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 tools/testing/selftests/bpf/.gitignore | 1 +
 1 file changed, 1 insertion(+)

-- 
2.17.0

Comments

Daniel Borkmann April 23, 2018, 9:34 p.m. UTC | #1
On 04/23/2018 03:50 PM, Anders Roxell wrote:
> Fixes: c0fa1b6c3efc ("bpf: btf: Add BTF tests")

> Signed-off-by: Anders Roxell <anders.roxell@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 5e1ab2f0eb79..3e3b3ced3f7c 100644

> --- a/tools/testing/selftests/bpf/.gitignore

> +++ b/tools/testing/selftests/bpf/.gitignore

> @@ -15,3 +15,4 @@ test_libbpf_open

>  test_sock

>  test_sock_addr

>  urandom_read

> +test_btf


Against which tree is this? This doesn't apply to bpf-next. It would
apply against bpf tree, but c0fa1b6c3efc ("bpf: btf: Add BTF tests")
is part of bpf-next, so fits to neither of them.
Anders Roxell April 23, 2018, 10:14 p.m. UTC | #2
On 23 April 2018 at 23:34, Daniel Borkmann <daniel@iogearbox.net> wrote:
> On 04/23/2018 03:50 PM, Anders Roxell wrote:

>> Fixes: c0fa1b6c3efc ("bpf: btf: Add BTF tests")

>> Signed-off-by: Anders Roxell <anders.roxell@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 5e1ab2f0eb79..3e3b3ced3f7c 100644

>> --- a/tools/testing/selftests/bpf/.gitignore

>> +++ b/tools/testing/selftests/bpf/.gitignore

>> @@ -15,3 +15,4 @@ test_libbpf_open

>>  test_sock

>>  test_sock_addr

>>  urandom_read

>> +test_btf

>

> Against which tree is this? This doesn't apply to bpf-next. It would

> apply against bpf tree, but c0fa1b6c3efc ("bpf: btf: Add BTF tests")

> is part of bpf-next, so fits to neither of them.


I'm sorry,

I did it against this patch [1] that I thought was already applied to
the bpf tree.

Cheers,
Anders
[1] https://patchwork.kernel.org/patch/10332907/
Daniel Borkmann April 23, 2018, 10:31 p.m. UTC | #3
On 04/24/2018 12:14 AM, Anders Roxell wrote:
> On 23 April 2018 at 23:34, Daniel Borkmann <daniel@iogearbox.net> wrote:

>> On 04/23/2018 03:50 PM, Anders Roxell wrote:

>>> Fixes: c0fa1b6c3efc ("bpf: btf: Add BTF tests")

>>> Signed-off-by: Anders Roxell <anders.roxell@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 5e1ab2f0eb79..3e3b3ced3f7c 100644

>>> --- a/tools/testing/selftests/bpf/.gitignore

>>> +++ b/tools/testing/selftests/bpf/.gitignore

>>> @@ -15,3 +15,4 @@ test_libbpf_open

>>>  test_sock

>>>  test_sock_addr

>>>  urandom_read

>>> +test_btf

>>

>> Against which tree is this? This doesn't apply to bpf-next. It would

>> apply against bpf tree, but c0fa1b6c3efc ("bpf: btf: Add BTF tests")

>> is part of bpf-next, so fits to neither of them.

> 

> I'm sorry,

> 

> I did it against this patch [1] that I thought was already applied to

> the bpf tree.


That was bpf tree since the original change already went to mainline; the
BTF is in bpf-next however, so you need to rebase your change against that.

Thanks,
Daniel
Daniel Borkmann April 24, 2018, 9:56 p.m. UTC | #4
On 04/24/2018 12:53 AM, Anders Roxell wrote:
> Fixes: c0fa1b6c3efc ("bpf: btf: Add BTF tests")

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> ---

> Rebased against bpf-next.


Applied to bpf-next, thanks Anders!
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore
index 5e1ab2f0eb79..3e3b3ced3f7c 100644
--- a/tools/testing/selftests/bpf/.gitignore
+++ b/tools/testing/selftests/bpf/.gitignore
@@ -15,3 +15,4 @@  test_libbpf_open
 test_sock
 test_sock_addr
 urandom_read
+test_btf