summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-12-21 19:33:36 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-12-21 19:33:36 +0100
commit3b9315542c8168b3a4f87be42e5b1eb8333d83b5 (patch)
treeacc353d86b2c55d2c9d3ab049cbabd89cd204d6e
parentd5f47dece220797de1f5f0c00e5632a7e88b5be2 (diff)
parent8d89470db234e2c566c72f67629a9ff217756bf7 (diff)
downloadkernel-3b9315542c8168b3a4f87be42e5b1eb8333d83b5.tar.gz
kernel-3b9315542c8168b3a4f87be42e5b1eb8333d83b5.tar.xz
kernel-3b9315542c8168b3a4f87be42e5b1eb8333d83b5.zip
Merge commit '8d89470db234e2c566c72f67629a9ff217756bf7' into f36-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec5
-rw-r--r--patch-6.0-redhat.patch2
-rw-r--r--sources6
3 files changed, 7 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index 54ec1dac0..6de04dc2e 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 250%{?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-200]
+* 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 bd91146c8..092b2da60 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)), \
diff --git a/sources b/sources
index 22ec3a63a..1ba38f0c7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0.13.tar.xz) = e95da8f8db8bee4036b3430811c5883efa4195579b7bac23a45c30e96537375a02bb77d101c5a0fc5da36879cd0ecb1dcc652c6e8bac63ceb693eb959a4ea643
-SHA512 (kernel-abi-stablelists-6.0.13.tar.bz2) = 177ae955ff64b8a2c9b2063ad8cdc8de96662aa9937012ea58ac49896a0d6f3f58c6e08829413313b576cd9415a35d017d71fbc729b5f2619ac41c8247f6ad51
-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) = 9ac31d14539abffed1d2ad46277a6beba0e960d83ffe41bc274367c452883184dba501cd67b299334661b7dc58ecd4b64ad2beeeb3114b40131c7fa914b75ca9
+SHA512 (kernel-kabi-dw-6.0.14.tar.bz2) = a0cc3a36e85db451596e2397c08dec84cc83f49201ac0c3e8aec5e008ac3d2162a3d2b577ea94e7a290bc931d270d6e9d2d55c445101612a7d1f2afe1e511341