act_mirred: remove unneded merge conflict markers

In commit 169a410 ("act_mirred: use the backlog for nested calls to mirred ingress"), a merge conflict marker snuck in, so remove it. Reported-by: Bart Van Assche <bvanassche@google.com> Fixes: 169a410 ("act_mirred: use the backlog for nested calls to mirred ingress") Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mariux64 · Jun 28, 2023 · 10fbd2e · 10fbd2e
1 parent 2230b3f
commit 10fbd2e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh
@@ -199,7 +199,6 @@ mirred_egress_to_ingress_tcp_test()
 	log_test "mirred_egress_to_ingress_tcp ($tcflags)"
 }
 
->>>>>>> e921d05033293 (act_mirred: use the backlog for nested calls to mirred ingress)
 setup_prepare()
 {
 	h1=${NETIFS[p1]}