diff --git a/.gitignore b/.gitignore index 7c07d3e11..a554b4c5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -SOURCES/kernel-abi-stablelists-5.14.0-570.10.1.el9_6.tar.bz2 -SOURCES/kernel-kabi-dw-5.14.0-570.10.1.el9_6.tar.bz2 -SOURCES/linux-5.14.0-570.10.1.el9_6.tar.xz +SOURCES/kernel-abi-stablelists-5.14.0-570.12.1.el9_6.tar.bz2 +SOURCES/kernel-kabi-dw-5.14.0-570.12.1.el9_6.tar.bz2 +SOURCES/linux-5.14.0-570.12.1.el9_6.tar.xz SOURCES/nvidiagpuoot001.x509 SOURCES/rheldup3.x509 SOURCES/rhelima.x509 diff --git a/.kernel.metadata b/.kernel.metadata index ab5f18176..bef9e15a8 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,6 +1,6 @@ -3de28fa6b7a6096ad2d88dca12196ccea09429a2 SOURCES/kernel-abi-stablelists-5.14.0-570.10.1.el9_6.tar.bz2 -8dc54e9218efa4996268d279bba133d97a7de60e SOURCES/kernel-kabi-dw-5.14.0-570.10.1.el9_6.tar.bz2 -731cf716b6719ad3b0fe89ababea7e82d4053212 SOURCES/linux-5.14.0-570.10.1.el9_6.tar.xz +34966a14caa2bbb9ee4185077b4fe3598016ec4f SOURCES/kernel-abi-stablelists-5.14.0-570.12.1.el9_6.tar.bz2 +8dc54e9218efa4996268d279bba133d97a7de60e SOURCES/kernel-kabi-dw-5.14.0-570.12.1.el9_6.tar.bz2 +a1df472f7f6c8eac39781cbf5294718bd392cfe8 SOURCES/linux-5.14.0-570.12.1.el9_6.tar.xz 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 99e571f9de4188f3b5fdf1f84ff73f6cc4bb6a0e SOURCES/rhelima.x509 diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 908c1a854..2e1c12884 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 6 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 570.10.1 +RHEL_RELEASE = 570.12.1 # # ZSTREAM diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index 407b64c05..28b69a1a3 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,11 @@ +* Fri Apr 04 2025 Patrick Talbert [5.14.0-570.12.1.el9_6] +- redhat: rebuild for prep-kerberos brew fix [RHEL-86037] +Resolves: RHEL-86037 + +* Thu Apr 03 2025 CKI KWF Bot [5.14.0-570.11.1.el9_6] +- Revert "nvme_core: scan namespaces asynchronously" (John Meneghini) [RHEL-84361] +Resolves: RHEL-84361 + * Fri Mar 28 2025 CKI KWF Bot [5.14.0-570.10.1.el9_6] - redhat: drop Y issues from changelog (Jan Stancek) - Reapply "perf util: Make util its own library" (Michael Petlan) [RHEL-79032] diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index ad6697496..88bd651e5 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -165,15 +165,15 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 570.10.1 +%define pkgrelease 570.12.1 %define kversion 5 -%define tarfile_release 5.14.0-570.10.1.el9_6 +%define tarfile_release 5.14.0-570.12.1.el9_6 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 570.10.1%{?buildid}%{?dist} +%define specrelease 570.12.1%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-570.10.1.el9_6 +%define kabiversion 5.14.0-570.12.1.el9_6 # # End of genspec.sh variables @@ -3784,14 +3784,20 @@ fi # # %changelog -* Wed Apr 09 2025 Andrew Lukoshko [5.14.0-570.10.1.el9_6] +* Tue May 13 2025 Andrew Lukoshko [5.14.0-570.12.1.el9_6] +- Merge up tag 'kernel-5.14.0-570.12.1.el9_6' (Scott Weaver) - Merge: Add symbols to stablelist and enable check-kabi (CKI KWF Bot) [RHEL-79882] - Merge tag 'kernel-5.14.0-570.10.1.el9_6' into main (Patrick Talbert) -- AlmaLinux changes (Andrew Lukoshko) - Merge tag 'kernel-5.14.0-570.5.1.el9_6' into main (Jan Stancek) - Merge tag 'kernel-5.14.0-570.4.1.el9_6' into main (Jan Stancek) - Merge tag 'kernel-5.14.0-570.3.1.el9_6' into 'main' (Patrick Talbert) +* Fri Apr 04 2025 Patrick Talbert [5.14.0-570.12.1.el9_6] +- redhat: rebuild for prep-kerberos brew fix [RHEL-86037] + +* Thu Apr 03 2025 CKI KWF Bot [5.14.0-570.11.1.el9_6] +- Revert "nvme_core: scan namespaces asynchronously" (John Meneghini) [RHEL-84361] + * Fri Mar 28 2025 CKI KWF Bot [5.14.0-570.10.1.el9_6] - redhat: drop Y issues from changelog (Jan Stancek) - Reapply "perf util: Make util its own library" (Michael Petlan) [RHEL-79032]