From: Greg Kroah-Hartman Date: Wed, 17 Dec 2025 15:25:20 +0000 (+0100) Subject: drop broken kdoc patch X-Git-Tag: v6.12.63~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e44d38184840086938d0d25cb430e482df4a034;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken kdoc patch --- diff --git a/queue-6.17/docs-kdoc-fix-duplicate-section-warning-message.patch b/queue-6.17/docs-kdoc-fix-duplicate-section-warning-message.patch deleted file mode 100644 index 591dde3aff..0000000000 --- a/queue-6.17/docs-kdoc-fix-duplicate-section-warning-message.patch +++ /dev/null @@ -1,107 +0,0 @@ -From b848c5692d66aa0123bf4ef843c4d270b9f1095a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 Oct 2025 12:58:32 -0700 -Subject: docs: kdoc: fix duplicate section warning message - -From: Jacob Keller - -[ Upstream commit e5e7ca66a7fc6b8073c30a048e1157b88d427980 ] - -The python version of the kernel-doc parser emits some strange warnings -with just a line number in certain cases: - -$ ./scripts/kernel-doc -Wall -none 'include/linux/virtio_config.h' -Warning: 174 -Warning: 184 -Warning: 190 -Warning: include/linux/virtio_config.h:226 No description found for return value of '__virtio_test_bit' -Warning: include/linux/virtio_config.h:259 No description found for return value of 'virtio_has_feature' -Warning: include/linux/virtio_config.h:283 No description found for return value of 'virtio_has_dma_quirk' -Warning: include/linux/virtio_config.h:392 No description found for return value of 'virtqueue_set_affinity' - -I eventually tracked this down to the lone call of emit_msg() in the -KernelEntry class, which looks like: - - self.emit_msg(self.new_start_line, f"duplicate section name '{name}'\n") - -This looks like all the other emit_msg calls. Unfortunately, the definition -within the KernelEntry class takes only a message parameter and not a line -number. The intended message is passed as the warning! - -Pass the filename to the KernelEntry class, and use this to build the log -message in the same way as the KernelDoc class does. - -To avoid future errors, mark the warning parameter for both emit_msg -definitions as a keyword-only argument. This will prevent accidentally -passing a string as the warning parameter in the future. - -Also fix the call in dump_section to avoid an unnecessary additional -newline. - -Fixes: e3b42e94cf10 ("scripts/lib/kdoc/kdoc_parser.py: move kernel entry to a class") -Signed-off-by: Jacob Keller -Signed-off-by: Jonathan Corbet -Message-ID: <20251030-jk-fix-kernel-doc-duplicate-return-warning-v2-1-ec4b5c662881@intel.com> -Signed-off-by: Sasha Levin ---- - scripts/lib/kdoc/kdoc_parser.py | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/scripts/lib/kdoc/kdoc_parser.py b/scripts/lib/kdoc/kdoc_parser.py -index fe730099eca86..386e4938c9c76 100644 ---- a/scripts/lib/kdoc/kdoc_parser.py -+++ b/scripts/lib/kdoc/kdoc_parser.py -@@ -134,6 +134,8 @@ class KernelEntry: - - self.leading_space = None - -+ self.fname = fname -+ - # State flags - self.brcount = 0 - self.declaration_start_line = ln + 1 -@@ -148,9 +150,11 @@ class KernelEntry: - return '\n'.join(self._contents) + '\n' - - # TODO: rename to emit_message after removal of kernel-doc.pl -- def emit_msg(self, log_msg, warning=True): -+ def emit_msg(self, ln, msg, *, warning=True): - """Emit a message""" - -+ log_msg = f"{self.fname}:{ln} {msg}" -+ - if not warning: - self.config.log.info(log_msg) - return -@@ -196,7 +200,7 @@ class KernelEntry: - # Only warn on user-specified duplicate section names - if name != SECTION_DEFAULT: - self.emit_msg(self.new_start_line, -- f"duplicate section name '{name}'\n") -+ f"duplicate section name '{name}'") - # Treat as a new paragraph - add a blank line - self.sections[name] += '\n' + contents - else: -@@ -247,15 +251,15 @@ class KernelDoc: - self.emit_msg(0, - 'Python 3.7 or later is required for correct results') - -- def emit_msg(self, ln, msg, warning=True): -+ def emit_msg(self, ln, msg, *, warning=True): - """Emit a message""" - -- log_msg = f"{self.fname}:{ln} {msg}" -- - if self.entry: -- self.entry.emit_msg(log_msg, warning) -+ self.entry.emit_msg(ln, msg, warning=warning) - return - -+ log_msg = f"{self.fname}:{ln} {msg}" -+ - if warning: - self.config.log.warning(log_msg) - else: --- -2.51.0 - diff --git a/queue-6.17/series b/queue-6.17/series index 7b202c7fc4..c1d7b6b06b 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -132,7 +132,6 @@ pidfs-add-missing-build_bug_on-assert-on-struct-pidf.patch i3c-fix-refcount-inconsistency-in-i3c_master_registe.patch i3c-master-svc-prevent-incomplete-ibi-transaction.patch random-use-offstack-cpumask-when-necessary.patch -docs-kdoc-fix-duplicate-section-warning-message.patch wifi-ath12k-fix-potential-memory-leak-in-ath12k_wow_.patch wifi-ath12k-fix-reusing-m3-memory.patch wifi-ath12k-fix-error-handling-in-creating-hardware-.patch diff --git a/queue-6.18/docs-kdoc-fix-duplicate-section-warning-message.patch b/queue-6.18/docs-kdoc-fix-duplicate-section-warning-message.patch deleted file mode 100644 index 2f6b9e2cc2..0000000000 --- a/queue-6.18/docs-kdoc-fix-duplicate-section-warning-message.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 78e6504b5df493156baaf742ec56ef06c506a1e2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 Oct 2025 12:58:32 -0700 -Subject: docs: kdoc: fix duplicate section warning message - -From: Jacob Keller - -[ Upstream commit e5e7ca66a7fc6b8073c30a048e1157b88d427980 ] - -The python version of the kernel-doc parser emits some strange warnings -with just a line number in certain cases: - -$ ./scripts/kernel-doc -Wall -none 'include/linux/virtio_config.h' -Warning: 174 -Warning: 184 -Warning: 190 -Warning: include/linux/virtio_config.h:226 No description found for return value of '__virtio_test_bit' -Warning: include/linux/virtio_config.h:259 No description found for return value of 'virtio_has_feature' -Warning: include/linux/virtio_config.h:283 No description found for return value of 'virtio_has_dma_quirk' -Warning: include/linux/virtio_config.h:392 No description found for return value of 'virtqueue_set_affinity' - -I eventually tracked this down to the lone call of emit_msg() in the -KernelEntry class, which looks like: - - self.emit_msg(self.new_start_line, f"duplicate section name '{name}'\n") - -This looks like all the other emit_msg calls. Unfortunately, the definition -within the KernelEntry class takes only a message parameter and not a line -number. The intended message is passed as the warning! - -Pass the filename to the KernelEntry class, and use this to build the log -message in the same way as the KernelDoc class does. - -To avoid future errors, mark the warning parameter for both emit_msg -definitions as a keyword-only argument. This will prevent accidentally -passing a string as the warning parameter in the future. - -Also fix the call in dump_section to avoid an unnecessary additional -newline. - -Fixes: e3b42e94cf10 ("scripts/lib/kdoc/kdoc_parser.py: move kernel entry to a class") -Signed-off-by: Jacob Keller -Signed-off-by: Jonathan Corbet -Message-ID: <20251030-jk-fix-kernel-doc-duplicate-return-warning-v2-1-ec4b5c662881@intel.com> -Signed-off-by: Sasha Levin ---- - scripts/lib/kdoc/kdoc_parser.py | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/scripts/lib/kdoc/kdoc_parser.py b/scripts/lib/kdoc/kdoc_parser.py -index 2376f180b1fa9..ccbc1fe4b7ccd 100644 ---- a/scripts/lib/kdoc/kdoc_parser.py -+++ b/scripts/lib/kdoc/kdoc_parser.py -@@ -274,6 +274,8 @@ class KernelEntry: - - self.leading_space = None - -+ self.fname = fname -+ - # State flags - self.brcount = 0 - self.declaration_start_line = ln + 1 -@@ -288,9 +290,11 @@ class KernelEntry: - return '\n'.join(self._contents) + '\n' - - # TODO: rename to emit_message after removal of kernel-doc.pl -- def emit_msg(self, log_msg, warning=True): -+ def emit_msg(self, ln, msg, *, warning=True): - """Emit a message""" - -+ log_msg = f"{self.fname}:{ln} {msg}" -+ - if not warning: - self.config.log.info(log_msg) - return -@@ -336,7 +340,7 @@ class KernelEntry: - # Only warn on user-specified duplicate section names - if name != SECTION_DEFAULT: - self.emit_msg(self.new_start_line, -- f"duplicate section name '{name}'\n") -+ f"duplicate section name '{name}'") - # Treat as a new paragraph - add a blank line - self.sections[name] += '\n' + contents - else: -@@ -387,15 +391,15 @@ class KernelDoc: - self.emit_msg(0, - 'Python 3.7 or later is required for correct results') - -- def emit_msg(self, ln, msg, warning=True): -+ def emit_msg(self, ln, msg, *, warning=True): - """Emit a message""" - -- log_msg = f"{self.fname}:{ln} {msg}" -- - if self.entry: -- self.entry.emit_msg(log_msg, warning) -+ self.entry.emit_msg(ln, msg, warning=warning) - return - -+ log_msg = f"{self.fname}:{ln} {msg}" -+ - if warning: - self.config.log.warning(log_msg) - else: --- -2.51.0 - diff --git a/queue-6.18/series b/queue-6.18/series index 0607a32e2d..9afd41c0ad 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -156,7 +156,6 @@ arm64-dts-ti-k3-j784s4-fix-i2c-pinmux-pull-configura.patch i3c-fix-refcount-inconsistency-in-i3c_master_registe.patch i3c-master-svc-prevent-incomplete-ibi-transaction.patch random-use-offstack-cpumask-when-necessary.patch -docs-kdoc-fix-duplicate-section-warning-message.patch wifi-ath12k-fix-potential-memory-leak-in-ath12k_wow_.patch wifi-ath12k-fix-reusing-m3-memory.patch wifi-ath12k-fix-error-handling-in-creating-hardware-.patch