diff --git a/Makefile.rhelver b/Makefile.rhelver index c2930e3e8..803f1358f 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 = 38 +RHEL_RELEASE = 39 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index aa9be280d..1919b9d8e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2924,9 +2924,8 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_VSOCKETS=m -CONFIG_HZ=100 -# CONFIG_HZ_1000 is not set -CONFIG_HZ_100=y +CONFIG_HZ_1000=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index c75e1214e..d4daf1a9c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2907,9 +2907,8 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_VSOCKETS=m -CONFIG_HZ=100 -# CONFIG_HZ_1000 is not set -CONFIG_HZ_100=y +CONFIG_HZ_1000=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set diff --git a/kernel.spec b/kernel.spec index 443eb96b3..fdc2022e4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -174,13 +174,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.0 %define specversion 6.5.0 %define patchversion 6.5 -%define pkgrelease 0.rc5.20230809git13b937206866.38 +%define pkgrelease 0.rc5.20230810git374a7f47bf40.39 %define kversion 6 -%define tarfile_release 6.5-rc5-53-g13b937206866 +%define tarfile_release 6.5-rc5-63-g374a7f47bf40 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20230809git13b937206866.38%{?buildid}%{?dist} +%define specrelease 0.rc5.20230810git374a7f47bf40.39%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3740,6 +3740,10 @@ fi\ # # %changelog +* Thu Aug 10 2023 Fedora Kernel Team [6.5.0-0.rc5.374a7f47bf40.39.el127] +- redhat/configs: Remove `CONFIG_HZ_1000 is not set` for aarch64 (Enric Balletbo i Serra) +- Linux v6.5.0-0.rc5.374a7f47bf40 + * Wed Aug 09 2023 Fedora Kernel Team [6.5.0-0.rc5.13b937206866.38.el127] - redhat/configs: turn on the framework for SPI NOR for ARM (Steve Best) - configs: add new ChromeOS UART driver (Mark Langsdorf) diff --git a/sources b/sources index fd2f371a5..439971e00 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc5-53-g13b937206866.tar.xz) = f5eae6df00b624f1ab83e223cc4d64a13b24417db05ddedfda720fd54cd1040ffc9825ca710944ba4ae3dc8e9cd26c17755e6ccb4555f85063998cb3461141b3 -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 16ed5f87648cb037ca346f2216c1284e7c8217c72ecc52f6b179d524a90cb0ced9d9aadcfc45c96c8a695660c4d5e304516b441b30fb1d2812715047460c04c0 -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 74fdefb2ec9bc52cd7989c97c87de9b18b9f89431136171d33b903ffee37de7eb32f4699dc08d8b72e7085764cc2805187951fac97e52fac6e1b4a0cf01c7019 +SHA512 (linux-6.5-rc5-63-g374a7f47bf40.tar.xz) = f20c258203ccec5580752544b5d3d8a5f8a5041bc39606a3234df1e02e8dada378883cadc56acbe159b9c61d2b09a936db24c26324366ed0db00ac49cb9118bd +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 5b5f5753d02ac38d928056dad2c47adc87d8a8be42f6bb0935b79968a52066687b83fdffbc84891efe9233d9f65e620ea195919a7ba06e11f9a58f7376387569 +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 78415469b01aeec84e55fec234d622eaa2a19e2d8077d807ccb5c2e2b5cb91e8777232c2b6e83224a7914b452c7682fbf708e04d9a68957d19a9e51f403eefea