mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

selftests/bpf: fix merge conflict

Browse source 
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>
This commit is contained in:
Alexei Starovoitov 2017-04-06 12:20:26 -07:00 committed by David S. Miller
parent 6f14f443d3
commit 89c0a36130
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/testing/selftests/bpf/test_verifier.c
View file

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