diff --git a/Makefile.rhelver b/Makefile.rhelver index 38e55fdf5..0c9781ca8 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 30 +RHEL_RELEASE = 31 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 5b03df0eb..6fcac3094 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Mon Nov 25 2024 Jan Stancek [6.12.0-31.el10] +- RHEL-only: mark io_uring tech preview and disable by default (Jeff Moyer) [RHEL-65347] +Resolves: RHEL-65347, RHEL-65498 + * Mon Nov 18 2024 Jan Stancek [6.12.0-30.el10] - Linux 6.12 (Linus Torvalds) - x86/mm: Fix a kdump kernel failure on SME system when CONFIG_IMA_KEXEC=y (Baoquan He) diff --git a/kernel.spec b/kernel.spec index 8677221b6..f5c5482c7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,15 +162,15 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 30 +%define pkgrelease 31 %define kversion 6 -%define tarfile_release 6.12.0-30.el10 +%define tarfile_release 6.12.0-31.el10 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 30%{?buildid}%{?dist} +%define specrelease 31%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.12.0-30.el10 +%define kabiversion 6.12.0-31.el10 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4270,6 +4270,9 @@ fi\ # # %changelog +* Mon Nov 25 2024 Jan Stancek [6.12.0-31.el10] +- RHEL-only: mark io_uring tech preview and disable by default (Jeff Moyer) [RHEL-65347] + * Mon Nov 18 2024 Jan Stancek [6.12.0-30.el10] - Linux 6.12 (Linus Torvalds) - x86/mm: Fix a kdump kernel failure on SME system when CONFIG_IMA_KEXEC=y (Baoquan He) diff --git a/sources b/sources index d3c23b026..75f2723ac 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.12.0-30.el10.tar.xz) = 4c4e495892ef16222ae054e91a805b3e8bea273a5a7e2e92334766e52b0786781a921c47aedac1d7e60f2f935549b1a6e777856dc421e7802aba8afdb18ecd29 -SHA512 (kernel-abi-stablelists-6.12.0-30.el10.tar.xz) = 9a2b57e64ccb6f1ff83305c1182cf17b973bc6b445da1d6bbb5a5f8bec4f3f3b4ae5efc2b9fdb3be121019dff2c4a49073a8fc61c1fd17fb02ee2848bf065554 -SHA512 (kernel-kabi-dw-6.12.0-30.el10.tar.xz) = 22f9b66774b5c877162b824c43377ef7d5ae9384641cbea87bd5c0b0f9b5445cdf3e26854f91a6b9ad30213b03ee3956e8996b5833c90eefdd5deea1f45ee4c2 +SHA512 (linux-6.12.0-31.el10.tar.xz) = d02a04e09ec1f2f962acea2c2efe800b16e059ba8ff1aebcd905c54024772344ac30e652f5e69f82ff9739573877af0f247e751e520d29ea7b7683c658cbc83a +SHA512 (kernel-abi-stablelists-6.12.0-31.el10.tar.xz) = 3d14a27567b4cafbc0a67eae14e1317824c3765df08c0111cd4bf45057e14e1f1f94f6eec021d031ba0b1ff38f12b10d146187bdf2041c7eda469965dede5e7d +SHA512 (kernel-kabi-dw-6.12.0-31.el10.tar.xz) = 8292fda927cfe95394454f01b09b1247f0fa8ca3a0f054a36653b0e26d487f67dae1e02bbcad373f6bbcabea1189d2b536001cd81e70678d5a700894452dc36c