5.15-stable patches

added patches:
	hamradio-fix-macro-redefine-warning.patch

diff --git a/queue-5.15/hamradio-fix-macro-redefine-warning.patch b/queue-5.15/hamradio-fix-macro-redefine-warning.patch
new file mode 100644 (file)
index 0000000..7aae928
--- /dev/null
+++ b/queue-5.15/hamradio-fix-macro-redefine-warning.patch
@@ -0,0 +1,32 @@
+From 16517829f2e02f096fb5ea9083d160381127faf3 Mon Sep 17 00:00:00 2001
+From: Huang Pei <huangpei@loongson.cn>
+Date: Tue, 23 Nov 2021 19:07:48 +0800
+Subject: hamradio: fix macro redefine warning
+
+From: Huang Pei <huangpei@loongson.cn>
+
+commit 16517829f2e02f096fb5ea9083d160381127faf3 upstream.
+
+MIPS/IA64 define END as assembly function ending, which conflict
+with END definition in mkiss.c, just undef it at first
+
+Reported-by: lkp@intel.com
+Signed-off-by: Huang Pei <huangpei@loongson.cn>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/hamradio/mkiss.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/hamradio/mkiss.c
++++ b/drivers/net/hamradio/mkiss.c
+@@ -31,6 +31,8 @@
+ 
+ #define AX_MTU                236
+ 
++/* some arch define END as assembly function ending, just undef it */
++#undef        END
+ /* SLIP/KISS protocol characters. */
+ #define END             0300          /* indicates end of frame       */
+ #define ESC             0333          /* indicates byte stuffing      */

diff --git a/queue-5.15/series b/queue-5.15/series
index 3e8fa2ccc0f8e150646b966777d80d77b1b98ca1..0aaea3e3ea285bb382edf18c3a98f5999081dea0 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -254,3 +254,4 @@ btrfs-do-not-start-relocation-until-in-progress-drops-are-done.patch
 revert-xfrm-xfrm_state_mtu-should-return-at-least-1280-for-ipv6.patch
 proc-fix-documentation-and-description-of-pagemap.patch
 kvm-x86-mmu-passing-up-the-error-state-of-mmu_alloc_shadow_roots.patch
+hamradio-fix-macro-redefine-warning.patch