Commit 89c0a361 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller

selftests/bpf: fix merge conflict

fix artifact of merge resolution
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f14f443
...@@ -4904,12 +4904,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv, ...@@ -4904,12 +4904,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
struct bpf_insn *prog = test->insns; struct bpf_insn *prog = test->insns;
int prog_len = probe_filter_length(prog); int prog_len = probe_filter_length(prog);
int prog_type = test->prog_type; int prog_type = test->prog_type;
<<<<<<< HEAD
int map_fds[MAX_NR_MAPS]; 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; const char *expected_err;
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment