diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-28 07:56:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-28 10:29:53 +0200 |
| commit | 10fbd2e04e400f5eb0b85207cb441d37709e583c (patch) | |
| tree | 2226d8bd8abb99d188e1ee028ecb03f108d277f3 /net/ethtool/common.h | |
| parent | 2230b3f874d9ee3fea33115f2118fcfc290867cb (diff) | |
| download | linux-stable-10fbd2e04e400f5eb0b85207cb441d37709e583c.tar.gz linux-stable-10fbd2e04e400f5eb0b85207cb441d37709e583c.tar.bz2 linux-stable-10fbd2e04e400f5eb0b85207cb441d37709e583c.zip | |
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>
Diffstat (limited to 'net/ethtool/common.h')
0 files changed, 0 insertions, 0 deletions