diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-10 18:44:48 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-10 18:44:48 +0100 |
| commit | bb5819a8596b6a56dcf06cbc6ced3713f9259c89 (patch) | |
| tree | 0750af8af72b06dfaf2d6b4f12470b3e5261cef6 | |
| parent | a483d942bb630f5c67e4b6ea412c6f0a7c1e8387 (diff) | |
| parent | b4b2f70953483f64ba0886dc370b1a65af040b84 (diff) | |
| download | kernel-bb5819a8596b6a56dcf06cbc6ced3713f9259c89.tar.gz kernel-bb5819a8596b6a56dcf06cbc6ced3713f9259c89.tar.xz kernel-bb5819a8596b6a56dcf06cbc6ced3713f9259c89.zip | |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 6 | ||||
| -rw-r--r-- | patch-6.0-redhat.patch | 29 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 36 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index 26433cb03..80c4f1a87 100755 --- a/kernel.spec +++ b/kernel.spec @@ -136,7 +136,7 @@ Summary: The Linux kernel # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 150%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.0.6 +%define kabiversion 6.0.7 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3186,6 +3186,10 @@ fi # # %changelog +* Thu Nov 03 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.7-0] +- Add revert patch for BTF workaround (Justin M. Forbes) +- Linux v6.0.7 + * Tue Nov 01 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.6-0] - drm/simpledrm: Only advertise formats that are supported (Justin M. Forbes) - disable enum64 BTF in fedora rawhide (Jiri Olsa) 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 + @@ -1,3 +1,3 @@ -SHA512 (linux-6.0.6.tar.xz) = 58f511b55b198c976418c2fa790b1b6a7f217f3474d1cafdb8ed6500a6080689cdc76a1c143be90b2c7efea3af463076bb4cfa1c75acd708b7a671cf2a5c5e6a -SHA512 (kernel-abi-stablelists-6.0.6.tar.bz2) = acb093fddc4d406f467580e725396f327921923f1df8a6758b437c6a1569fa45a47e380aa2f23030c5095bdf1ec546d077dfbaf1a6f64dc2708d4ffdb6bb7352 -SHA512 (kernel-kabi-dw-6.0.6.tar.bz2) = 5a3c76bc07b52d70e14707efa1b54b6614c1dcf4915238cc08c3d186b65bce9955699a45f8ffb6c9b844344d525d584c658b790a75a073ca0358b6947469a627 +SHA512 (linux-6.0.7.tar.xz) = a7b298fbf3ff5bf759755589748b16428fdf35225013709eeb645bd09368937ed4f7f6c23c70cdfa077e8d20cffa2ee4fbb24e4e3023bafcb46c845aeeaff19e +SHA512 (kernel-abi-stablelists-6.0.7.tar.bz2) = a143f1c80d1cdbb93e04d8ad6f97be6ef1611421f110782614f020458ce0538964d4c66edf4511e78bec3b6542c60194c6d2fc96cc75b23f226d347b1938e19c +SHA512 (kernel-kabi-dw-6.0.7.tar.bz2) = 5aa98ec0bc19d220383ea9d869254b8d998bd7a591206079d254a5249c0d3e7c17391cbe7e4789d63003ee2e2b971ab40255f38b9404462012d17421bd1eb7a4 |