This is a note to let you know that I've just added the patch titled
scripts/pahole-flags.sh: Use pahole-version.sh
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:
scripts-pahole-flags.sh-use-pahole-version.sh.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 2d6c9810eb8915c4ddede707b8e167a1d919e1ca Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <nathan@xxxxxxxxxx>
Date: Tue, 1 Feb 2022 13:56:22 -0700
Subject: scripts/pahole-flags.sh: Use pahole-version.sh
From: Nathan Chancellor <nathan@xxxxxxxxxx>
commit 2d6c9810eb8915c4ddede707b8e167a1d919e1ca upstream.
Use pahole-version.sh to get pahole's version code 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-4-nathan@xxxxxxxxxx
Signed-off-by: Matthias Maennich <maennich@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
scripts/pahole-flags.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -7,7 +7,7 @@ if ! [ -x "$(command -v ${PAHOLE})" ]; t
exit 0
fi
-pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
+pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE})
if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
# pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
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
