diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2023-01-20 11:07:06 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2023-01-20 11:07:06 -0600 |
| commit | 71f8956c7f136d8522ffa50143cbfb94266e39cb (patch) | |
| tree | bf222a30d85ef053471d592a9c56f475fb61b931 | |
| parent | 75aca9d44e26a3320473ba9f868a79c82cc20d1f (diff) | |
| download | kernel-71f8956c7f136d8522ffa50143cbfb94266e39cb.tar.gz kernel-71f8956c7f136d8522ffa50143cbfb94266e39cb.tar.xz kernel-71f8956c7f136d8522ffa50143cbfb94266e39cb.zip | |
kernel-6.2.0-0.rc4.20230120gitd368967cb103.35
* Fri Jan 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.d368967cb103.35]
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
Resolves:
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rwxr-xr-x | kernel.spec | 11 | ||||
| -rw-r--r-- | patch-6.2-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 13 insertions, 10 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index ccca41829..af759d5f9 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 34 +RHEL_RELEASE = 35 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index 2b93dce6b..a216a71f2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -126,13 +126,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc4.20230119git7287904c8771.34 +%define pkgrelease 0.rc4.20230120gitd368967cb103.35 %define kversion 6 -%define tarfile_release 6.2-rc4-67-g7287904c8771 +%define tarfile_release 6.2-rc4-77-gd368967cb103 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20230119git7287904c8771.34%{?buildid}%{?dist} +%define specrelease 0.rc4.20230120gitd368967cb103.35%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3226,9 +3226,12 @@ fi # # %changelog -* Thu Jan 19 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.7287904c8771.34] +* Fri Jan 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.d368967cb103.35] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) +* Fri Jan 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.d368967cb103.34] +- Linux v6.2.0-0.rc4.d368967cb103 + * Thu Jan 19 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.7287904c8771.33] - modules-core: use %%posttrans (Gerd Hoffmann) - split sub-rpm kernel-modules-core from kernel-core (Gerd Hoffmann) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index fa19ab9fd..c1c46ec85 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -228,7 +228,7 @@ index fbd646dbf440..23ca9cdb2438 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 2b6091349daa..b9eafa68df6e 100644 +index 696c9e007a36..80a56c8eaaae 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -239,7 +239,7 @@ index 2b6091349daa..b9eafa68df6e 100644 #include <linux/hugetlb.h> #include <linux/kmemleak.h> -@@ -980,6 +981,9 @@ void __init setup_arch(char **cmdline_p) +@@ -981,6 +982,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc4-67-g7287904c8771.tar.xz) = 21ba74d41fb501553995b00a12a8691cac881a7da5c47f04a4204930216761b5c425a5064d087c89ef796d02e6016297af1c4c8550be3c2d0acba1330c30b0a3 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 5f34604fc0dce1f93b89ab60a2fb0885fa1d9a70c1dd179dcbf82d1cf82d2c22199e4cd1e441c5e1818a32e1bd4080195858f0dd4d7b7d9f129776029ef35914 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = e72f2febb6cefd9c9b813c024d3e5bf41197c759500f021578ae9fae9b83e9128f272e01529f9fa59788a483549ceadeb7d54c7af41cb32382f0a533ae51b9b9 +SHA512 (linux-6.2-rc4-77-gd368967cb103.tar.xz) = 563aaf43981476a2e62efa864d579968633e0f8248f937e09eae716558dcd7dc1006101458484e6a0b3e819cb5736a1867337795de30b03be5b7a5e896ab43e8 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = d8966e98b8dc0658da8442d883d51e0a453a761f1c1c6c49084403476d372bef3a85293ba0e3d1afcae756eed53c32983dd4bb52095f23e5938310bd537a9157 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = ff93bf0094e415a7d076cb583e6653af714b2b901e3f8f73bf3a599a4e34ac3270701b81773d4f1a10ba28b9e9f7ef81252ea9ef1cbf56ef5f57cd9c4ab0c206 |