From: Jakub Kicinski <jakub.kicinski@xxxxxxxxxxxxx>
Date: Mon, 4 Nov 2019 08:27:21 -0800
> On Mon, 4 Nov 2019 15:27:02 +0100, Daniel Borkmann wrote:
>> Commit 5bc60de50dfe ("selftests: bpf: Don't try to read files without
>> read permission") got reverted as the fix was not working as expected
>> and real fix came in via 8101e069418d ("selftests: bpf: Skip write
>> only files in debugfs"). When bpf-next got merged into net-next, the
>> test_offload.py had a small conflict. Fix the resolution in ae8a76fb8b5d
>> iby not reintroducing 5bc60de50dfe again.
>>
>> Fixes: ae8a76fb8b5d ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next")
>> Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
>> Cc: Jakub Kicinski <jakub.kicinski@xxxxxxxxxxxxx>
>> Cc: Alexei Starovoitov <ast@xxxxxxxxxx>
>
> Ayayay :(
>
> Acked-by: Jakub Kicinski <jakub.kicinski@xxxxxxxxxxxxx>
Applied.
