diff --git a/.kernel.metadata b/.kernel.metadata
index 32687e74df1ba6f9a8a49b821e2651fa5bc971b4..cee06ee602a086552e611494b8fadaab0db82655 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,3 +1,3 @@
-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
+3baad38cb392d5c1b1a62c690a89a74cd43ee63377f7e39ab69536b7bb2b6bb1 SOURCES/kernel-abi-stablelists-6.12.0-61.el10.tar.xz
+b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-61.el10.tar.xz
+9cb421f65f68bf05c473c6cb06997ef06f115abd5872b7a28c8fe5cfec3f7f89 SOURCES/linux-6.12.0-61.el10.tar.xz
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index b90cbc848776e7c0f94a78a6a1a8c1d267f80947..00248b984d72bd3fe08a729dc674eaf52543436f 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 = 60
+RHEL_RELEASE = 61
#
# RHEL_REBASE_NUM
diff --git a/SOURCES/dracut-virt.conf b/SOURCES/dracut-virt.conf
index 3bd3baaa614e7eb4dabbcd6df10dda270bd22538..41f989eca9ec08f76f33a60a8a28928d7b0de2b9 100644
--- a/SOURCES/dracut-virt.conf
+++ b/SOURCES/dracut-virt.conf
@@ -27,6 +27,11 @@ dracutmodules+=" systemd-sysext "
# modules: root disk integrity protection
dracutmodules+=" systemd-veritysetup "
+# modules: FIPS
+dracutmodules+=" fips "
+# FIPS mode requires early crypto drivers test
+drivers+=" =crypto "
+
# drivers: virtual buses, pci
drivers+=" virtio-pci virtio-mmio " # qemu-kvm
drivers+=" hv-vmbus pci-hyperv " # hyperv
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index d80e825a22421d288aa69bf5535cf1124faa842e..1b9e8fe658a2b5fb9385e5ce002df18f5bf4d523 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,45 @@
+* Fri Mar 07 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-61.el10]
+- af_packet: fix vlan_get_tci() vs MSG_PEEK (CKI Backport Bot) [RHEL-80305] {CVE-2024-57902}
+- smb: client: fix chmod(2) regression with ATTR_READONLY (Paulo Alcantara) [RHEL-80534]
+- sched_ext: Fix incorrect autogroup migration detection (CKI Backport Bot) [RHEL-81482] {CVE-2025-21771}
+- PCI: vmd: Set devices to D0 before enabling PM L1 Substates (Myron Stowe) [RHEL-47437]
+- PCI: vmd: Add DID 8086:B06F and 8086:B60B for Intel client SKUs (Myron Stowe) [RHEL-47437]
+- kernel.spec: add missing tools-libs on s390x (Jan Stancek) [RHEL-80626]
+- arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array (CKI Backport Bot) [RHEL-81669] {CVE-2025-21785}
+- kexec/crash: no crash update when kexec in progress (Mamatha Inamdar) [RHEL-76749]
+- md/raid*: Fix the set_queue_limits implementations (Nigel Croxon) [RHEL-73721]
+- md: Fix linear_set_limits() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime (Nigel Croxon) [RHEL-73721]
+- md/md-linear: Fix a NULL vs IS_ERR() bug in linear_add() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: move bitmap_{start, end}write to md upper layer (Nigel Croxon) [RHEL-73721]
+- md/raid5: implement pers->bitmap_sector() (Nigel Croxon) [RHEL-73721]
+- md: add a new callback pers->bitmap_sector() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: remove the last parameter for bimtap_ops->endwrite() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: factor behind write counters out from bitmap_{start/end}write() (Nigel Croxon) [RHEL-73721]
+- md: Replace deprecated kmap_atomic() with kmap_local_page() (Nigel Croxon) [RHEL-73721]
+- md/raid10: Atomic write support (Nigel Croxon) [RHEL-73721]
+- md/raid1: Atomic write support (Nigel Croxon) [RHEL-73721]
+- md/raid0: Atomic write support (Nigel Croxon) [RHEL-73721]
+- block: Support atomic writes limits for stacked devices (Nigel Croxon) [RHEL-73721]
+- md/raid5: Increase r5conf.cache_name size (Nigel Croxon) [RHEL-73721]
+- md/raid10: Handle bio_split() errors (Nigel Croxon) [RHEL-73721]
+- md/raid1: Handle bio_split() errors (Nigel Croxon) [RHEL-73721]
+- md/raid0: Handle bio_split() errors (Nigel Croxon) [RHEL-73721]
+- md/raid5: Wait sync io to finish before changing group cnt (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: Add missing destroy_work_on_stack() (Nigel Croxon) [RHEL-73721]
+- md/raid5: don't set Faulty rdev for blocked_rdev (Nigel Croxon) [RHEL-73721]
+- md/raid10: don't wait for Faulty rdev in wait_blocked_rdev() (Nigel Croxon) [RHEL-73721]
+- md/raid1: don't wait for Faulty rdev in wait_blocked_rdev() (Nigel Croxon) [RHEL-73721]
+- md/raid1: factor out helper to handle blocked rdev from raid1_write_request() (Nigel Croxon) [RHEL-73721]
+- md: don't record new badblocks for faulty rdev (Nigel Croxon) [RHEL-73721]
+- md: don't wait faulty rdev in md_wait_for_blocked_rdev() (Nigel Croxon) [RHEL-73721]
+- md: add a new helper rdev_blocked() (Nigel Croxon) [RHEL-73721]
+- md/raid5-ppl: Use atomic64_inc_return() in ppl_new_iounit() (Nigel Croxon) [RHEL-73721]
+- RDMA/mlx5: Fix a WARN during dereg_mr for DM type (Benjamin Poirier) [RHEL-41204]
+- arm64: mm: Fix zone_dma_limit calculation (Luiz Capitulino) [RHEL-71568]
+- uki: enable FIPS mode (Vitaly Kuznetsov) [RHEL-80149]
+Resolves: RHEL-41204, RHEL-47437, RHEL-71568, RHEL-73721, RHEL-76749, RHEL-80149, RHEL-80305, RHEL-80534, RHEL-80626, RHEL-81482, RHEL-81669
+
* 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]
@@ -158,6 +200,12 @@ Resolves: RHEL-75925, RHEL-76843, RHEL-77986, RHEL-78189, RHEL-79162
- Bump RHEL MINOR to 10.1 (Julio Faracco)
Resolves: RHEL-78946, RHEL-79097
+* Thu Mar 06 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-55.3.1.el10_0]
+- RDMA/mlx5: Fix a WARN during dereg_mr for DM type (Benjamin Poirier) [RHEL-41204]
+- arm64: mm: Fix zone_dma_limit calculation (Luiz Capitulino) [RHEL-71568]
+- uki: enable FIPS mode (Vitaly Kuznetsov) [RHEL-80149]
+Resolves: RHEL-41204, RHEL-71568, RHEL-80149
+
* 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]
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 320663ae20e692b0b4f3638c1dccf1e0a27f4b24..5c025edbd03f6451a3356c54dbacc373aea4d901 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 60
+%define pkgrelease 61
%define kversion 6
-%define tarfile_release 6.12.0-60.el10
+%define tarfile_release 6.12.0-61.el10
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 60%{?buildid}%{?dist}
+%define specrelease 61%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.12.0-60.el10
+%define kabiversion 6.12.0-61.el10
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -860,7 +860,7 @@ BuildRequires: lld
%endif
%if %{with_efiuki}
-BuildRequires: dracut
+BuildRequires: dracut >= 104
# For dracut UEFI uki binaries
BuildRequires: binutils
# For the initrd
@@ -4079,8 +4079,8 @@ fi\
%files -f %{package_name}-tools-debuginfo.list -n %{package_name}-tools-debuginfo
%endif
-%ifarch %{cpupowerarchs}
%files -n %{package_name}-tools-libs
+%ifarch %{cpupowerarchs}
%{_libdir}/libcpupower.so.1
%{_libdir}/libcpupower.so.0.0.1
%endif
@@ -4314,11 +4314,52 @@ fi\
#
#
%changelog
-* Thu Mar 06 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-60
+* Mon Mar 10 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-61
- Porting to Rocky Linux 10, debranding and Rocky Linux branding
- Add partial riscv64 support for build root
- Provide basic VisionFive 2 support
+* Fri Mar 07 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-61.el10]
+- af_packet: fix vlan_get_tci() vs MSG_PEEK (CKI Backport Bot) [RHEL-80305] {CVE-2024-57902}
+- smb: client: fix chmod(2) regression with ATTR_READONLY (Paulo Alcantara) [RHEL-80534]
+- sched_ext: Fix incorrect autogroup migration detection (CKI Backport Bot) [RHEL-81482] {CVE-2025-21771}
+- PCI: vmd: Set devices to D0 before enabling PM L1 Substates (Myron Stowe) [RHEL-47437]
+- PCI: vmd: Add DID 8086:B06F and 8086:B60B for Intel client SKUs (Myron Stowe) [RHEL-47437]
+- kernel.spec: add missing tools-libs on s390x (Jan Stancek) [RHEL-80626]
+- arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array (CKI Backport Bot) [RHEL-81669] {CVE-2025-21785}
+- kexec/crash: no crash update when kexec in progress (Mamatha Inamdar) [RHEL-76749]
+- md/raid*: Fix the set_queue_limits implementations (Nigel Croxon) [RHEL-73721]
+- md: Fix linear_set_limits() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime (Nigel Croxon) [RHEL-73721]
+- md/md-linear: Fix a NULL vs IS_ERR() bug in linear_add() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: move bitmap_{start, end}write to md upper layer (Nigel Croxon) [RHEL-73721]
+- md/raid5: implement pers->bitmap_sector() (Nigel Croxon) [RHEL-73721]
+- md: add a new callback pers->bitmap_sector() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: remove the last parameter for bimtap_ops->endwrite() (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: factor behind write counters out from bitmap_{start/end}write() (Nigel Croxon) [RHEL-73721]
+- md: Replace deprecated kmap_atomic() with kmap_local_page() (Nigel Croxon) [RHEL-73721]
+- md/raid10: Atomic write support (Nigel Croxon) [RHEL-73721]
+- md/raid1: Atomic write support (Nigel Croxon) [RHEL-73721]
+- md/raid0: Atomic write support (Nigel Croxon) [RHEL-73721]
+- block: Support atomic writes limits for stacked devices (Nigel Croxon) [RHEL-73721]
+- md/raid5: Increase r5conf.cache_name size (Nigel Croxon) [RHEL-73721]
+- md/raid10: Handle bio_split() errors (Nigel Croxon) [RHEL-73721]
+- md/raid1: Handle bio_split() errors (Nigel Croxon) [RHEL-73721]
+- md/raid0: Handle bio_split() errors (Nigel Croxon) [RHEL-73721]
+- md/raid5: Wait sync io to finish before changing group cnt (Nigel Croxon) [RHEL-73721]
+- md/md-bitmap: Add missing destroy_work_on_stack() (Nigel Croxon) [RHEL-73721]
+- md/raid5: don't set Faulty rdev for blocked_rdev (Nigel Croxon) [RHEL-73721]
+- md/raid10: don't wait for Faulty rdev in wait_blocked_rdev() (Nigel Croxon) [RHEL-73721]
+- md/raid1: don't wait for Faulty rdev in wait_blocked_rdev() (Nigel Croxon) [RHEL-73721]
+- md/raid1: factor out helper to handle blocked rdev from raid1_write_request() (Nigel Croxon) [RHEL-73721]
+- md: don't record new badblocks for faulty rdev (Nigel Croxon) [RHEL-73721]
+- md: don't wait faulty rdev in md_wait_for_blocked_rdev() (Nigel Croxon) [RHEL-73721]
+- md: add a new helper rdev_blocked() (Nigel Croxon) [RHEL-73721]
+- md/raid5-ppl: Use atomic64_inc_return() in ppl_new_iounit() (Nigel Croxon) [RHEL-73721]
+- RDMA/mlx5: Fix a WARN during dereg_mr for DM type (Benjamin Poirier) [RHEL-41204]
+- arm64: mm: Fix zone_dma_limit calculation (Luiz Capitulino) [RHEL-71568]
+- uki: enable FIPS mode (Vitaly Kuznetsov) [RHEL-80149]
+
* 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]