]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up permission error in queue-5.15/kbuild-add-config_pahole_version.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Feb 2023 10:21:02 +0000 (11:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Feb 2023 10:21:02 +0000 (11:21 +0100)
queue-5.15/kbuild-add-config_pahole_version.patch

index efd4e934b0e9958fe49620536f84051c86a34099..2ad84c9c73e0ceaf67df04a50c54c17f23ecfb5b 100644 (file)
@@ -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 <nathan@kernel.org>
 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 <maennich@google.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <gregkh@linuxfoundation.org>
  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 <gregkh@linuxfoundation.org>
  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 <gregkh@linuxfoundation.org>
 +fi
 +
 +"$@" --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'
+-- 
+2.39.2
+