diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-10 18:44:43 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-10 18:44:43 +0100 |
| commit | 950ec3e287f2d5d06ea01692e48eef56f8580617 (patch) | |
| tree | 8b33abee6e77954b5c79d4a7cdee26d0117c5691 /patch-6.0-redhat.patch | |
| parent | 6f25f28635cfe2aa8e5ff4497b2899c5b22e4ecf (diff) | |
| parent | a9e9670a326cca75ad163449a1e3c7c9ccdb8dd5 (diff) | |
| download | kernel-950ec3e287f2d5d06ea01692e48eef56f8580617.tar.gz kernel-950ec3e287f2d5d06ea01692e48eef56f8580617.tar.xz kernel-950ec3e287f2d5d06ea01692e48eef56f8580617.zip | |
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
Diffstat (limited to 'patch-6.0-redhat.patch')
| -rw-r--r-- | patch-6.0-redhat.patch | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index aa4faf1ed..d780947ee 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -45,7 +45,7 @@ 44 files changed, 609 insertions(+), 199 deletions(-) diff --git a/Makefile b/Makefile -index e6c10009d413..e9fc5ea8e350 100644 +index c2144a4bb2ef..4e8ae58e2ec1 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1682,3 +1682,30 @@ index d5a0dd548989..ee5e98204d3d 100755 } ipv4_grp_fcnal() +From 90c4bd0059367922f88768784bfb7c5ec1bc846c Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" <jforbes@fedoraproject.org> +Date: Thu, 3 Nov 2022 11:34:03 -0500 +Subject: [PATCH] Revert "disable enum64 BTF in fedora rawhide" + +This option is not supported by older pahole versions. + +This reverts commit 7ab8e0d8b46b7f768e37f8ff39ccae2ecc897396. +--- + scripts/pahole-flags.sh | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh +index 81c8e082ec57..0d99ef17e4a5 100755 +--- a/scripts/pahole-flags.sh ++++ b/scripts/pahole-flags.sh +@@ -20,7 +20,4 @@ if [ "${pahole_ver}" -ge "122" ]; then + extra_paholeopt="${extra_paholeopt} -j" + fi + +-# temporary workaround to disable enum64 +-extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" +- + echo ${extra_paholeopt} +-- +2.37.3 + |