2018-02-21 21:31:05

by Anders Roxell

Subject: [PATCH] selftests/bpf: update gitignore with 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 <[email protected]>
---
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
--
2.11.0

2018-02-21 21:39:45

by Daniel Díaz

Subject: Re: [PATCH] selftests/bpf: update gitignore with test_libbpf_open

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 <[email protected]>

Tested-by: Daniel Díaz <[email protected]>

> ---
> 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

2018-02-21 22:49:37

by David Miller

Subject: Re: [PATCH] selftests/bpf: update gitignore with test_libbpf_open

From: Anders Roxell <[email protected]>
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 <[email protected]>

Acked-by: David S. Miller <[email protected]>

2018-02-21 23:04:13

by Shuah Khan

Subject: Re: [PATCH] selftests/bpf: update gitignore with test_libbpf_open

On 02/21/2018 03:48 PM, David Miller wrote:
> From: Anders Roxell <[email protected]>
> 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 <[email protected]>
>
> Acked-by: David S. Miller <[email protected]>
>
>

Thanks. I will pull this in for 4.16-rc

-- Shuah

2018-02-22 00:34:17

by Daniel Borkmann

Subject: Re: [PATCH] selftests/bpf: update gitignore with test_libbpf_open

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 <[email protected]>
>> 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 <[email protected]>
>>
>> Acked-by: David S. Miller <[email protected]>
>
> 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

2018-02-22 00:38:09

by Shuah Khan

Subject: Re: [PATCH] selftests/bpf: update gitignore with test_libbpf_open

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 <[email protected]>
>>> 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 <[email protected]>
>>>
>>> Acked-by: David S. Miller <[email protected]>
>>
>> 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 <[email protected]>

thanks,
-- Shuah

2018-02-22 00:45:06

by Daniel Borkmann

Subject: Re: [PATCH] selftests/bpf: update gitignore with test_libbpf_open

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 <[email protected]>
>>>> 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 <[email protected]>
>>>>
>>>> Acked-by: David S. Miller <[email protected]>
>>>
>>> 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 <[email protected]>
>
> thanks,
> -- Shuah
>