From 0538865508d3eb9d3aa058d31fcf1114dd12b791 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 27 Nov 2024 09:44:58 +0300 Subject: [PATCH] import kernel-6.12.0-31.el10 --- .gitignore | 6 +++--- .kernel.metadata | 6 +++--- SOURCES/Makefile.rhelver | 2 +- SOURCES/kernel.changelog | 4 ++++ SPECS/kernel.spec | 11 +++++++---- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 4b4ebc0..bfaa4b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/fedoraimaca.x509 -SOURCES/kernel-abi-stablelists-6.12.0-30.el10.tar.xz -SOURCES/kernel-kabi-dw-6.12.0-30.el10.tar.xz -SOURCES/linux-6.12.0-30.el10.tar.xz +SOURCES/kernel-abi-stablelists-6.12.0-31.el10.tar.xz +SOURCES/kernel-kabi-dw-6.12.0-31.el10.tar.xz +SOURCES/linux-6.12.0-31.el10.tar.xz SOURCES/nvidiagpuoot001.x509 SOURCES/redhatsecureboot501.cer SOURCES/redhatsecurebootca5.cer diff --git a/.kernel.metadata b/.kernel.metadata index 2fd8304..f938c6b 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,7 +1,7 @@ 9b16961bd5da2dc805f1b73414c201d4371613f1 SOURCES/fedoraimaca.x509 -fd66983bdfcfcd236ff34dd6e8f5c9c5298f38e0 SOURCES/kernel-abi-stablelists-6.12.0-30.el10.tar.xz -9261c66f67ca8422b0ac5fdd86fd25786a33185e SOURCES/kernel-kabi-dw-6.12.0-30.el10.tar.xz -1b14c2cb25da79d2c456905fb829bf91c583ec59 SOURCES/linux-6.12.0-30.el10.tar.xz +bc6a308dc19cdfca3574af50ffee45804be797be SOURCES/kernel-abi-stablelists-6.12.0-31.el10.tar.xz +10588f85d3073e65f8874cb41ce1e40e434f5e50 SOURCES/kernel-kabi-dw-6.12.0-31.el10.tar.xz +660a35845def4c4f728bd047feda1d02ab3c50de SOURCES/linux-6.12.0-31.el10.tar.xz 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 38e55fd..0c9781c 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/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/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index 5b03df0..6fcac30 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/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/SPECS/kernel.spec b/SPECS/kernel.spec index 8677221..f5c5482 100644 --- a/SPECS/kernel.spec +++ b/SPECS/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)