Greg Kroah-Hartman 10fbd2e04e 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>

2023-06-28 10:29:53 +02:00

..

fault-injection

…

ktest

ktest.pl: Add RUN_TIMEOUT option with default unlimited

2023-03-10 09:40:10 +01:00

kunit

kunit: tool: Import missing importlib.abc

2022-02-23 12:03:04 +01:00

nvdimm

memremap: remove support for external pgmap refcounts

2022-08-17 14:23:43 +02:00

radix-tree

idr test suite: Improve reporting from idr_find_test_1

2021-04-01 07:50:42 -04:00

scatterlist

Merge branch 'akpm' (patches from Andrew)

2021-09-03 10:08:28 -07:00

selftests

act_mirred: remove unneded merge conflict markers

2023-06-28 10:29:53 +02:00

vsock

vsock_diag_test: remove free_sock_stat() call in test_no_sockets

2021-10-15 17:21:34 -07:00