5.4-stable patches

added patches:
	kgdb-fix-gcc-11-warnings-harder.patch

diff --git a/queue-5.4/kgdb-fix-gcc-11-warnings-harder.patch b/queue-5.4/kgdb-fix-gcc-11-warnings-harder.patch
new file mode 100644 (file)
index 0000000..fc04982
--- /dev/null
+++ b/queue-5.4/kgdb-fix-gcc-11-warnings-harder.patch
@@ -0,0 +1,40 @@
+From bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 20 May 2021 15:08:39 +0200
+Subject: kgdb: fix gcc-11 warnings harder
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f upstream.
+
+40cc3a80bb42 ("kgdb: fix gcc-11 warning on indentation") tried to fix up
+the gcc-11 complaints in this file by just reformatting the #defines.
+That worked for gcc 11.1.0, but in gcc 11.1.1 as shipped by Fedora 34,
+the warning came back for one of the #defines.
+
+Fix this up again by putting { } around the if statement, now it is
+quiet again.
+
+Fixes: 40cc3a80bb42 ("kgdb: fix gcc-11 warning on indentation")
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: Daniel Thompson <daniel.thompson@linaro.org>
+Cc: Jason Wessel <jason.wessel@windriver.com>
+Link: https://lore.kernel.org/r/20210520130839.51987-1-gregkh@linuxfoundation.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/misc/kgdbts.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/misc/kgdbts.c
++++ b/drivers/misc/kgdbts.c
+@@ -100,8 +100,9 @@
+               printk(KERN_INFO a);    \
+ } while (0)
+ #define v2printk(a...) do {           \
+-      if (verbose > 1)                \
++      if (verbose > 1) {              \
+               printk(KERN_INFO a);    \
++      }                               \
+       touch_nmi_watchdog();           \
+ } while (0)
+ #define eprintk(a...) do {            \

diff --git a/queue-5.4/series b/queue-5.4/series
index 17dcc0e2db352059ce639d830a3ac71d1af61128..2ecd75583ec3741d61547f813e301e9958443486 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -34,3 +34,4 @@ drm-amdgpu-vcn2.5-add-cancel_delayed_work_sync-before-power-gate.patch
 selftests-gpio-use-test_gen_progs_extended.patch
 selftests-gpio-move-include-of-lib.mk-up.patch
 selftests-gpio-fix-build-when-source-tree-is-read-on.patch
+kgdb-fix-gcc-11-warnings-harder.patch