summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@fb.com>2017-04-06 12:20:26 -0700
committerDavid S. Miller <davem@davemloft.net>2017-04-06 12:21:59 -0700
commit89c0a361301f81d76be5ab77c3f5470b88792670 (patch)
tree920d7bcc637b2edebd2188c23b216caed6a62f1f /tools
parent6f14f443d3e773439fb9cc6f2685ba90d5d026c5 (diff)
downloadlinux-89c0a361301f81d76be5ab77c3f5470b88792670.tar.gz
linux-89c0a361301f81d76be5ab77c3f5470b88792670.tar.bz2
linux-89c0a361301f81d76be5ab77c3f5470b88792670.zip
selftests/bpf: fix merge conflict
fix artifact of merge resolution Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/bpf/test_verifier.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index 0963f8ffd25c..6178b65fee59 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -4904,12 +4904,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
struct bpf_insn *prog = test->insns;
int prog_len = probe_filter_length(prog);
int prog_type = test->prog_type;
-<<<<<<< HEAD
int map_fds[MAX_NR_MAPS];
- int fd_prog, expected_ret;
-=======
- int fd_f1 = -1, fd_f2 = -1, fd_f3 = -1;
->>>>>>> ea6b1720ce25f92f7a17b2e0c2b653d20773d10a
const char *expected_err;
int i;