From: Greg Kroah-Hartman Date: Fri, 24 Feb 2023 10:21:02 +0000 (+0100) Subject: fix up permission error in queue-5.15/kbuild-add-config_pahole_version.patch X-Git-Tag: v6.2.1~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97def95fa3dfbfd8b8b285e65b071a8fc6e2085f;p=thirdparty%2Fkernel%2Fstable-queue.git fix up permission error in queue-5.15/kbuild-add-config_pahole_version.patch --- diff --git a/queue-5.15/kbuild-add-config_pahole_version.patch b/queue-5.15/kbuild-add-config_pahole_version.patch index efd4e934b0e..2ad84c9c73e 100644 --- a/queue-5.15/kbuild-add-config_pahole_version.patch +++ b/queue-5.15/kbuild-add-config_pahole_version.patch @@ -1,4 +1,4 @@ -From 613fe169237785a4bb1d06397b52606b2967da53 Mon Sep 17 00:00:00 2001 +From b837e01972839be43c20ef1812abf94babe1322d Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Tue, 1 Feb 2022 13:56:21 -0700 Subject: kbuild: Add CONFIG_PAHOLE_VERSION @@ -23,12 +23,14 @@ Link: https://lore.kernel.org/bpf/20220201205624.652313-3-nathan@kernel.org Signed-off-by: Matthias Maennich Signed-off-by: Greg Kroah-Hartman --- - MAINTAINERS | 1 + - init/Kconfig | 4 ++++ - scripts/pahole-version.sh | 13 +++++++++++++ + MAINTAINERS | 1 + + init/Kconfig | 4 ++++ + scripts/pahole-version.sh | 13 +++++++++++++ 3 files changed, 18 insertions(+) create mode 100755 scripts/pahole-version.sh +diff --git a/MAINTAINERS b/MAINTAINERS +index 4f50a453e18a..826e2ba7b09a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3407,6 +3407,7 @@ F: net/sched/act_bpf.c @@ -39,6 +41,8 @@ Signed-off-by: Greg Kroah-Hartman F: tools/bpf/ F: tools/lib/bpf/ F: tools/testing/selftests/bpf/ +diff --git a/init/Kconfig b/init/Kconfig +index a4144393717b..dafc3ba6fa7a 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -91,6 +91,10 @@ config CC_HAS_ASM_INLINE @@ -52,6 +56,9 @@ Signed-off-by: Greg Kroah-Hartman config CONSTRUCTORS bool +diff --git a/scripts/pahole-version.sh b/scripts/pahole-version.sh +new file mode 100755 +index 000000000000..f8a32ab93ad1 --- /dev/null +++ b/scripts/pahole-version.sh @@ -0,0 +1,13 @@ @@ -68,3 +75,6 @@ Signed-off-by: Greg Kroah-Hartman +fi + +"$@" --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/' +-- +2.39.2 +