subject:"\[PATCH net\-next\] selftests\/bpf\: fix merge conflict"

Re: [PATCH net-next] selftests/bpf: fix merge conflict

2017-04-06 Thread David Miller

From: Alexei Starovoitov Date: Thu, 6 Apr 2017 12:20:26 -0700 > fix artifact of merge resolution > > Signed-off-by: Alexei Starovoitov > Acked-by: Daniel Borkmann Sorry about that, applied, thanks!

[PATCH net-next] selftests/bpf: fix merge conflict

2017-04-06 Thread Alexei Starovoitov

fix artifact of merge resolution Signed-off-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- tools/testing/selftests/bpf/test_verifier.c | 5 - 1 file changed, 5 deletions(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index 0