6.1-stable patches

added patches:
	scripts-dtc-remove-unused-dts_version-in-dtc-lexer.l.patch

diff --git a/queue-6.1/scripts-dtc-remove-unused-dts_version-in-dtc-lexer.l.patch b/queue-6.1/scripts-dtc-remove-unused-dts_version-in-dtc-lexer.l.patch
new file mode 100644 (file)
index 0000000..56a97be
--- /dev/null
+++ b/queue-6.1/scripts-dtc-remove-unused-dts_version-in-dtc-lexer.l.patch
@@ -0,0 +1,55 @@
+From stable+bounces-240015-greg=kroah.com@vger.kernel.org Tue Apr 21 02:37:02 2026
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 20 Apr 2026 17:36:46 -0700
+Subject: scripts/dtc: Remove unused dts_version in dtc-lexer.l
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,  Sasha Levin <sashal@kernel.org>
+Cc: stable@vger.kernel.org, devicetree@vger.kernel.org,  Nathan Chancellor <nathan@kernel.org>
+Message-ID: <20260420-stable-dts-unused-but-set-global-v1-1-9bdfba6889bb@kernel.org>
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+This patch is for stable only. Commit 5a09df20872c ("scripts/dtc: Update
+to upstream version v1.7.2-69-g53373d135579") upstream applied it as
+part of a regular scripts/dtc sync, which may be unsuitable for older
+versions of stable where the warning it fixes is present.
+
+A recent strengthening of -Wunused-but-set-variable (enabled with -Wall)
+in clang under a new subwarning, -Wunused-but-set-global, points out an
+unused static global variable in dtc-lexer.lex.c (compiled from
+dtc-lexer.l):
+
+  scripts/dtc/dtc-lexer.lex.c:641:12: warning: variable 'dts_version' set but not used [-Wunused-but-set-global]
+    641 | static int dts_version = 1;
+        |            ^
+
+Remove it to clear up the warning, as it is truly unused.
+
+Fixes: 658f29a51e98 ("of/flattree: Update dtc to current mainline.")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+This should apply cleanly to all supported stable branches.
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/dtc/dtc-lexer.l |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -39,8 +39,6 @@ extern bool treesource_error;
+ #define DPRINT(fmt, ...)      do { } while (0)
+ #endif
+ 
+-static int dts_version = 1;
+-
+ #define BEGIN_DEFAULT()               DPRINT("<V1>\n"); \
+                               BEGIN(V1); \
+ 
+@@ -101,7 +99,6 @@ static void PRINTF(1, 2) lexical_error(c
+ 
+ <*>"/dts-v1/" {
+                       DPRINT("Keyword: /dts-v1/\n");
+-                      dts_version = 1;
+                       BEGIN_DEFAULT();
+                       return DT_V1;
+               }

diff --git a/queue-6.1/series b/queue-6.1/series
index 6d8a8e53f998459be6c14d6f655529aa62d171a0..104065d7c3ebd50955a5fb9b4f9f394d892eefb4 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -137,3 +137,4 @@ scsi-ufs-core-fix-use-after-free-in-init-error-and-remove-paths.patch
 alsa-control-avoid-warn-for-symlink-errors.patch
 f2fs-fix-null-ptr-deref-in-f2fs_submit_page_bio.patch
 wifi-iwlwifi-read-txq-read_ptr-under-lock.patch
+scripts-dtc-remove-unused-dts_version-in-dtc-lexer.l.patch