Skip to contentSkip to conversation

selftests/bpf: fix merge conflict

PATCH In review Alexei Starovoitov 2 participants 2 messages Apr 6, 2017

Subsystems (5)
Networking Network drivers Kselftest BPF +1 more subsystems
lore
Share & tools
lore

Alexei Starovoitov

author
#0 lore raw

PATCH 1/1 selftests/bpf: fix merge conflict

fix artifact of merge resolution

Signed-off-by Alexei Starovoitov <[email protected]>
Acked-by Daniel Borkmann <[email protected]>
---
 tools/testing/selftests/bpf/test_verifier.c | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/bpf/test_verifier.c +0 -5
index 0963f8ffd25c..6178b65fee59 100644
@@ -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;
Signature · 1 line
2.9.3