mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
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 <bvanassche@google.com> Fixes: 169a41073993 ("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>
This commit is contained in:
parent
7e53435c09
commit
8486f91ed9
1 changed files with 0 additions and 1 deletions
|
@ -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]}
|
||||
|
|
Loading…
Add table
Reference in a new issue