commit: 05f176184ad749c5e3d3208b8f6e1165855dd482 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Sat Mar 29 10:59:27 2025 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sat Mar 29 10:59:27 2025 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=05f17618
Remove redundant patch Removed: 2901_tools-lib-subcmd-compile-fix.patch Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 --- 2901_tools-lib-subcmd-compile-fix.patch | 54 --------------------------------- 2 files changed, 58 deletions(-) diff --git a/0000_README b/0000_README index accea09e..6196ef75 100644 --- a/0000_README +++ b/0000_README @@ -151,10 +151,6 @@ Patch: 2400_wifi-mt76-mt7921-null-ptr-deref-fix.patch From: https://github.com/nbd168/wireless/commit/adc3fd2a2277b7cc0b61692463771bf9bd298036 Desc: wifi: mt76: mt7921: fix kernel panic due to null pointer dereference -Patch: 2901_tools-lib-subcmd-compile-fix.patch -From: https://lore.kernel.org/all/[email protected]/ -Desc: tools lib subcmd: Fixed uninitialized use of variable in parse-options - Patch: 2910_bfp-mark-get-entry-ip-as--maybe-unused.patch From: https://www.spinics.net/lists/stable/msg604665.html Desc: bpf: mark get_entry_ip as __maybe_unused diff --git a/2901_tools-lib-subcmd-compile-fix.patch b/2901_tools-lib-subcmd-compile-fix.patch deleted file mode 100644 index bb1f7ffd..00000000 --- a/2901_tools-lib-subcmd-compile-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -From git@z Thu Jan 1 00:00:00 1970 -Subject: [PATCH] tools lib subcmd: Fixed uninitialized use of variable in - parse-options -From: Michael Weiß <[email protected]> -Date: Wed, 31 Jul 2024 10:52:17 +0200 -Message-Id: <[email protected]> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Since commit ea558c86248b ("tools lib subcmd: Show parent options in -help"), our debug images fail to build. - -For our Yocto-based GyroidOS, we build debug images with debugging enabled -for all binaries including the kernel. Yocto passes the corresponding gcc -option "-Og" also to the kernel HOSTCFLAGS. This results in the following -build error: - - parse-options.c: In function ‘options__order’: - parse-options.c:834:9: error: ‘o’ may be used uninitialized [-Werror=maybe-uninitialized] - 834 | memcpy(&ordered[nr_opts], o, sizeof(*o)); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - parse-options.c:812:30: note: ‘o’ was declared here - 812 | const struct option *o, *p = opts; - | ^ - .. - -Fix it by initializing 'o' instead of 'p' in the above failing line 812. -'p' is initialized afterwards in the following for-loop anyway. -I think that was the intention of the commit ea558c86248b ("tools lib -subcmd: Show parent options in help") in the first place. - -Fixes: ea558c86248b ("tools lib subcmd: Show parent options in help") -Signed-off-by: Michael Weiß <[email protected]> ---- - tools/lib/subcmd/parse-options.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c -index 4b60ec03b0bb..2a3b51a690c7 100644 ---- a/tools/lib/subcmd/parse-options.c -+++ b/tools/lib/subcmd/parse-options.c -@@ -809,7 +809,7 @@ static int option__cmp(const void *va, const void *vb) - static struct option *options__order(const struct option *opts) - { - int nr_opts = 0, nr_group = 0, nr_parent = 0, len; -- const struct option *o, *p = opts; -+ const struct option *o = opts, *p; - struct option *opt, *ordered = NULL, *group; - - /* flatten the options that have parents */ --- -2.39.2 -
