From 8486f91ed94b26d7e31495a850171a2d06fa23eb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Jun 2023 07:56:26 +0200 Subject: [PATCH] act_mirred: remove unneded merge conflict markers In commit 169a41073993 ("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 Fixes: 169a41073993 ("act_mirred: use the backlog for nested calls to mirred ingress") Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/forwarding/tc_actions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh index 22a1e4c9553a..1e27031288c8 100755 --- 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]}