From 435b94643d481ef43ca459624ec77af63ec2136b Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Thu, 6 Mar 2025 20:28:41 +0000
Subject: [PATCH] import kernel-6.12.0-60.el10

---
 .kernel.metadata         |  6 +++---
 SOURCES/Makefile.rhelver |  2 +-
 SOURCES/kernel.changelog | 45 +++++++++++++++++++++++++++++++++++++++-
 SPECS/kernel.spec        | 30 ++++++++++++++++++++++-----
 4 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/.kernel.metadata b/.kernel.metadata
index ecb5582..32687e7 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,3 +1,3 @@
-b07f38ccc48424a687e803e85ef8a858bd1e3c967e2ef16af7ec8e3245e54261 SOURCES/kernel-abi-stablelists-6.12.0-59.el10.tar.xz
-b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-59.el10.tar.xz
-dc0381f4c2fb1c5c2fa06eff7dfeb8ba40606918ec06f96bd8ceed931f8fd020 SOURCES/linux-6.12.0-59.el10.tar.xz
+53c7344e7da6965ddb6d7beb028947ace7cf9e9be8ba510062c0695442be9497 SOURCES/kernel-abi-stablelists-6.12.0-60.el10.tar.xz
+b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-60.el10.tar.xz
+92080a5db1fec24a8f7c3cc5f0a865e19a369fc29d7736ef37c65765d656f3ae SOURCES/linux-6.12.0-60.el10.tar.xz
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index 4a3d7c8..b90cbc8 100644
--- a/SOURCES/Makefile.rhelver
+++ b/SOURCES/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 1
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 59
+RHEL_RELEASE = 60
 
 #
 # RHEL_REBASE_NUM
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index f218066..d80e825 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,24 @@
+* Wed Mar 05 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-60.el10]
+- idpf: call set_real_num_queues in idpf_open (CKI Backport Bot) [RHEL-79464]
+- tracing: Fix bad hist from corrupting named_triggers list (Tomas Glozar) [RHEL-80060]
+- net/smc: support ipv4 mapped ipv6 addr client for smc-r v2 (Mete Durlu) [RHEL-79809]
+- af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK (CKI Backport Bot) [RHEL-74125] {CVE-2024-57901}
+- cxgb4: use port number to set mac addr (CKI Backport Bot) [RHEL-75473]
+- Documentation/powerpc/fadump: add additional parameter feature details (Mamatha Inamdar) [RHEL-70827]
+- powerpc: increase MIN RMA size for CAS negotiation (Mamatha Inamdar) [RHEL-70827]
+- powerpc/fadump: fix additional param memory reservation for HASH MMU (Mamatha Inamdar) [RHEL-70827]
+- powerpc: export MIN RMA size (Mamatha Inamdar) [RHEL-70827]
+- scsi: mpi3mr: Update driver version to 8.12.1.0.50 (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Synchronous access b/w reset and tm thread for reply queue (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Avoid reply queue full condition (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Fix possible crash when setting up bsg fails (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Handling of fault code for insufficient power (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Start controller indexing from 0 (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Fix corrupt config pages PHY state is switched in sysfs (Chandrakanth Patil) [RHEL-30789] {CVE-2024-57804}
+- scsi: mpi3mr: Synchronize access to ioctl data buffer (Chandrakanth Patil) [RHEL-30789]
+- redhat: regenerate self-test data for new RHDISTGIT_BRANCH (Patrick Talbert)
+Resolves: RHEL-30789, RHEL-70827, RHEL-74125, RHEL-75473, RHEL-79464, RHEL-79809, RHEL-80060
+
 * Mon Mar 03 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-59.el10]
 - gpu: host1x: Fix a use of uninitialized mutex (Rupinderjit Singh) [RHEL-67594]
 - selftests/memfd: add test for mapping write-sealed memfd read-only (Rafael Aquini) [RHEL-77292] {CVE-2024-57937}
@@ -6,7 +27,7 @@
 - redhat: adjust rhel branch name (Jan Stancek)
 - redhat: set defaults for RHEL 10.0 (Jan Stancek)
 - Revert "x86/kvm: Override default caching mode for SEV-SNP and TDX" (Vitaly Kuznetsov) [RHEL-76109]
-Resolves: RHEL-67594, RHEL-74426, RHEL-77292
+Resolves: RHEL-67594, RHEL-74426, RHEL-76109, RHEL-77292
 
 * Thu Feb 27 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-58.el10]
 - quota: flush quota_release_work upon quota writeback (CKI Backport Bot) [RHEL-73465]
@@ -137,6 +158,28 @@ Resolves: RHEL-75925, RHEL-76843, RHEL-77986, RHEL-78189, RHEL-79162
 - Bump RHEL MINOR to 10.1 (Julio Faracco)
 Resolves: RHEL-78946, RHEL-79097
 
+* Mon Mar 03 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-55.2.1.el10_0]
+- Documentation/powerpc/fadump: add additional parameter feature details (Mamatha Inamdar) [RHEL-70827]
+- powerpc: increase MIN RMA size for CAS negotiation (Mamatha Inamdar) [RHEL-70827]
+- powerpc/fadump: fix additional param memory reservation for HASH MMU (Mamatha Inamdar) [RHEL-70827]
+- powerpc: export MIN RMA size (Mamatha Inamdar) [RHEL-70827]
+- scsi: mpi3mr: Update driver version to 8.12.1.0.50 (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Synchronous access b/w reset and tm thread for reply queue (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Avoid reply queue full condition (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Fix possible crash when setting up bsg fails (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Handling of fault code for insufficient power (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Start controller indexing from 0 (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Fix corrupt config pages PHY state is switched in sysfs (Chandrakanth Patil) [RHEL-30789] {CVE-2024-57804}
+- scsi: mpi3mr: Synchronize access to ioctl data buffer (Chandrakanth Patil) [RHEL-30789]
+- redhat: regenerate self-test data for new RHDISTGIT_BRANCH (Patrick Talbert)
+Resolves: RHEL-30789, RHEL-70827
+
+* Thu Feb 27 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-55.1.1.el10_0]
+- redhat: adjust rhel branch name (Jan Stancek)
+- redhat: set defaults for RHEL 10.0 (Jan Stancek)
+- Revert "x86/kvm: Override default caching mode for SEV-SNP and TDX" (Vitaly Kuznetsov) [RHEL-76109]
+Resolves: RHEL-76109
+
 * Sun Feb 16 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-55.el10]
 - ovl: support encoding fid from inode with no alias (Miklos Szeredi) [RHEL-77301] {CVE-2025-21654}
 - ovl: pass realinode to ovl_encode_real_fh() instead of realdentry (Miklos Szeredi) [RHEL-77301] {CVE-2025-21654}
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 5bbe662..320663a 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 59
+%define pkgrelease 60
 %define kversion 6
-%define tarfile_release 6.12.0-59.el10
+%define tarfile_release 6.12.0-60.el10
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 59%{?buildid}%{?dist}
+%define specrelease 60%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.12.0-59.el10
+%define kabiversion 6.12.0-60.el10
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -4314,11 +4314,31 @@ fi\
 #
 #
 %changelog
-* Wed Mar 05 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-59
+* Thu Mar 06 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-60
 - Porting to Rocky Linux 10, debranding and Rocky Linux branding
 - Add partial riscv64 support for build root
 - Provide basic VisionFive 2 support
 
+* Wed Mar 05 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-60.el10]
+- idpf: call set_real_num_queues in idpf_open (CKI Backport Bot) [RHEL-79464]
+- tracing: Fix bad hist from corrupting named_triggers list (Tomas Glozar) [RHEL-80060]
+- net/smc: support ipv4 mapped ipv6 addr client for smc-r v2 (Mete Durlu) [RHEL-79809]
+- af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK (CKI Backport Bot) [RHEL-74125] {CVE-2024-57901}
+- cxgb4: use port number to set mac addr (CKI Backport Bot) [RHEL-75473]
+- Documentation/powerpc/fadump: add additional parameter feature details (Mamatha Inamdar) [RHEL-70827]
+- powerpc: increase MIN RMA size for CAS negotiation (Mamatha Inamdar) [RHEL-70827]
+- powerpc/fadump: fix additional param memory reservation for HASH MMU (Mamatha Inamdar) [RHEL-70827]
+- powerpc: export MIN RMA size (Mamatha Inamdar) [RHEL-70827]
+- scsi: mpi3mr: Update driver version to 8.12.1.0.50 (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Synchronous access b/w reset and tm thread for reply queue (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Avoid reply queue full condition (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Fix possible crash when setting up bsg fails (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Handling of fault code for insufficient power (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Start controller indexing from 0 (Chandrakanth Patil) [RHEL-30789]
+- scsi: mpi3mr: Fix corrupt config pages PHY state is switched in sysfs (Chandrakanth Patil) [RHEL-30789] {CVE-2024-57804}
+- scsi: mpi3mr: Synchronize access to ioctl data buffer (Chandrakanth Patil) [RHEL-30789]
+- redhat: regenerate self-test data for new RHDISTGIT_BRANCH (Patrick Talbert)
+
 * Mon Mar 03 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-59.el10]
 - gpu: host1x: Fix a use of uninitialized mutex (Rupinderjit Singh) [RHEL-67594]
 - selftests/memfd: add test for mapping write-sealed memfd read-only (Rafael Aquini) [RHEL-77292] {CVE-2024-57937}
-- 
GitLab