From: Greg Kroah-Hartman Date: Mon, 7 Mar 2022 16:42:40 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.9.305~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e15ec23642581e9c026fe6e3941fc091dc670ea;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: hamradio-fix-macro-redefine-warning.patch --- diff --git a/queue-5.4/hamradio-fix-macro-redefine-warning.patch b/queue-5.4/hamradio-fix-macro-redefine-warning.patch new file mode 100644 index 00000000000..7aae92836d4 --- /dev/null +++ b/queue-5.4/hamradio-fix-macro-redefine-warning.patch @@ -0,0 +1,32 @@ +From 16517829f2e02f096fb5ea9083d160381127faf3 Mon Sep 17 00:00:00 2001 +From: Huang Pei +Date: Tue, 23 Nov 2021 19:07:48 +0800 +Subject: hamradio: fix macro redefine warning + +From: Huang Pei + +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 +Signed-off-by: David S. Miller +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman +--- + 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.4/series b/queue-5.4/series index 1b6fd7f5c33..0686e2f1687 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -62,3 +62,4 @@ btrfs-qgroup-fix-deadlock-between-rescan-worker-and-remove-qgroup.patch btrfs-add-missing-run-of-delayed-items-after-unlink-during-log-replay.patch revert-xfrm-xfrm_state_mtu-should-return-at-least-1280-for-ipv6.patch net-dcb-disable-softirqs-in-dcbnl_flush_dev.patch +hamradio-fix-macro-redefine-warning.patch