act_mirred: remove unneded merge conflict markers
In commit 169a4107 ("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: 169a4107 ("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>
parent
2230b3f8
Please register or sign in to comment