From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 28 Jun 2023 06:00:46 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v4.14.320~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f60013e1aecaeaa5de1525476cad4b4770e88624;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	act_mirred-remove-unneded-merge-conflict-markers.patch
---

diff --git a/queue-5.15/act_mirred-remove-unneded-merge-conflict-markers.patch b/queue-5.15/act_mirred-remove-unneded-merge-conflict-markers.patch
new file mode 100644
index 00000000000..1de1b462137
--- /dev/null
+++ b/queue-5.15/act_mirred-remove-unneded-merge-conflict-markers.patch
@@ -0,0 +1,27 @@
+From foo@baz Wed Jun 28 07:56:26 AM CEST 2023
+Date: Wed, 28 Jun 2023 07:56:26 +0200
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: 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>
+---
+ tools/testing/selftests/net/forwarding/tc_actions.sh |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- 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]}
diff --git a/queue-5.15/series b/queue-5.15/series
index c506abb95e1..af199753f36 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -94,3 +94,4 @@ drm-radeon-fix-race-condition-uaf-in-radeon_gem_set_.patch
 vhost_net-revert-upend_idx-only-on-retriable-error.patch
 x86-apic-fix-kernel-panic-when-booting-with-intremap.patch
 i2c-imx-lpi2c-fix-type-char-overflow-issue-when-calc.patch
+act_mirred-remove-unneded-merge-conflict-markers.patch