This is a note to let you know that I've just added the patch titled
lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
lib-kconfig.debug-use-config_pahole_version.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6323c81350b73a4569cf52df85f80273faa64071 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <nathan@xxxxxxxxxx>
Date: Tue, 1 Feb 2022 13:56:23 -0700
Subject: lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION
From: Nathan Chancellor <nathan@xxxxxxxxxx>
commit 6323c81350b73a4569cf52df85f80273faa64071 upstream.
Now that CONFIG_PAHOLE_VERSION exists, use it in the definition of
CONFIG_PAHOLE_HAS_SPLIT_BTF and CONFIG_PAHOLE_HAS_BTF_TAG to reduce the
amount of duplication across the tree.
Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
Link: https://lore.kernel.org/bpf/20220201205624.652313-5-nathan@xxxxxxxxxx
[maennich: omitted patching non-existing config PAHOLE_HAS_BTF_TAG]
Signed-off-by: Matthias Maennich <maennich@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
lib/Kconfig.debug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -328,7 +328,7 @@ config DEBUG_INFO_BTF
DWARF type info into equivalent deduplicated BTF type info.
config PAHOLE_HAS_SPLIT_BTF
- def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'` -ge "119")
+ def_bool PAHOLE_VERSION >= 119
config DEBUG_INFO_BTF_MODULES
def_bool y
Patches currently in stable-queue which might be from nathan@xxxxxxxxxx are
queue-5.15/scripts-pahole-flags.sh-use-pahole-version.sh.patch
queue-5.15/lib-kconfig.debug-allow-btf-dwarf5-with-pahole-1.21.patch
queue-5.15/ext4-fix-function-prototype-mismatch-for-ext4_feat_ktype.patch
queue-5.15/kbuild-add-config_pahole_version.patch
queue-5.15/lib-kconfig.debug-use-config_pahole_version.patch
