diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-21 19:33:15 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-21 19:33:15 +0100 |
commit | 3a8c92e9683136214855833149b2a84098efcb21 (patch) | |
tree | 8aaa643b5113675fb6fd611424cd843fdec28b4c | |
parent | 2f32742acabaf09ce5dfe901269aac5231e37a5c (diff) | |
parent | 138c879ac76e5ccaa9e3d9a8fded34fd65d06ced (diff) | |
download | kernel-3a8c92e9683136214855833149b2a84098efcb21.tar.gz kernel-3a8c92e9683136214855833149b2a84098efcb21.tar.xz kernel-3a8c92e9683136214855833149b2a84098efcb21.zip |
Merge commit '138c879ac76e5ccaa9e3d9a8fded34fd65d06ced' into f37-user-thl-vanilla-fedora
-rwxr-xr-x | kernel.spec | 5 | ||||
-rw-r--r-- | patch-6.0-redhat.patch | 2 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 7f1c71d6d..806e93270 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.13 +%define kabiversion 6.0.14 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3186,8 +3186,9 @@ fi # # %changelog -* Wed Dec 14 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.13-300] +* Mon Dec 19 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.14-0] - Remove F35 from release_targets due to EOL (Justin M. Forbes) +- Linux v6.0.14 * Wed Dec 14 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.13-0] - Linux v6.0.13 diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index bb3cc1374..3f9a1729b 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -48,7 +48,7 @@ 47 files changed, 767 insertions(+), 365 deletions(-) diff --git a/Makefile b/Makefile -index bf00f3240b3a..f6fb779815ef 100644 +index a3c02b45fb57..97c8cb2941db 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-6.0.13.tar.xz) = e95da8f8db8bee4036b3430811c5883efa4195579b7bac23a45c30e96537375a02bb77d101c5a0fc5da36879cd0ecb1dcc652c6e8bac63ceb693eb959a4ea643 -SHA512 (kernel-abi-stablelists-6.0.13.tar.bz2) = 27caddd8bbedee77bb3287aef44efdf1c09d52b1ecaab63919a8e11a25b1ebe085a71da258563f2160cd6e3784e2a32a99176e0e7073850e5e107665bbb4d5e7 -SHA512 (kernel-kabi-dw-6.0.13.tar.bz2) = 766f9b1032469d66c41ea14fbeff03b6c24dc9da107ce61f70f9f3b230735643ca3fe7ec72a4c4b350959aa5081e7e4215f807acd85e651374afd6d9eddf4e0c +SHA512 (linux-6.0.14.tar.xz) = 2028f697caf789d6dfa81bc5dfe40d9ca967d65368df6cbcb42fbaf6078589c3c17cf10b4a899b799c139b5cdc0465ff4fdb249d15ef901ed0d872ad91c7499b +SHA512 (kernel-abi-stablelists-6.0.14.tar.bz2) = 611865dd02789d0086c93b30c63538560ea5c3d3b62cbd5ea233f04758ee77180593a8522993b7ccafbeac54e9fdcf1fa9d0bd2626519b3057e91000251cf1db +SHA512 (kernel-kabi-dw-6.0.14.tar.bz2) = a0cc3a36e85db451596e2397c08dec84cc83f49201ac0c3e8aec5e008ac3d2162a3d2b577ea94e7a290bc931d270d6e9d2d55c445101612a7d1f2afe1e511341 |