diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-03 18:42:39 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-11-03 18:42:39 +0100 |
commit | 6ba59b6667ed35f787883f79a69f8d94c66a5efd (patch) | |
tree | 2c54bab8405ca395266079f8419688b35ebda1ce | |
parent | e02274a61a7a176e6ebfdcfb8c2f516aacddf506 (diff) | |
parent | 5eeaf6d4b5476c0bc45152abd123a6b7cefaaa81 (diff) | |
download | kernel-6ba59b6667ed35f787883f79a69f8d94c66a5efd.tar.gz kernel-6ba59b6667ed35f787883f79a69f8d94c66a5efd.tar.xz kernel-6ba59b6667ed35f787883f79a69f8d94c66a5efd.zip |
Merge remote-tracking branch 'origin/f37' into f37-user-thl-vanilla-fedora
-rwxr-xr-x | kernel.spec | 6 | ||||
-rw-r--r-- | patch-6.0-redhat.patch | 2 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index 2cc9a48ff..cf58d0e32 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 350%{?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..eae1ece2e 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)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-6.0.6.tar.xz) = 58f511b55b198c976418c2fa790b1b6a7f217f3474d1cafdb8ed6500a6080689cdc76a1c143be90b2c7efea3af463076bb4cfa1c75acd708b7a671cf2a5c5e6a -SHA512 (kernel-abi-stablelists-6.0.6.tar.bz2) = 4a32f5e0149cd63cd36b7949c53a4cb5144c15c386449c354ada3199a7a953a9a606f5bc9be542435bc40b3db13db5689bdd496943c6fb46c20e30ca2c6cc577 -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) = 6ecdb77bc89d7ef89adadb1d7a857b56101a2bde8a0b109da23df358a8973beb3b2f2fe35e47b598cc4f6260f13a9dffc3cc6c91231ae43853bd74851d2da8b7 +SHA512 (kernel-kabi-dw-6.0.7.tar.bz2) = 5aa98ec0bc19d220383ea9d869254b8d998bd7a591206079d254a5249c0d3e7c17391cbe7e4789d63003ee2e2b971ab40255f38b9404462012d17421bd1eb7a4 |