diff --git a/.kernel.metadata b/.kernel.metadata
index 11af16069929a3e438988a59483688670f9fc0d1..9326c03b995c95826037244c37432fb149be6c01 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,3 +1,3 @@
-88b9897d9acb95991a5c0f345e74940ffb520791bd9ac3f417a80bc6735e6ba5 SOURCES/kernel-abi-stablelists-6.12.0-62.el10.tar.xz
-b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-62.el10.tar.xz
-3b725d9d13ec3edc7b3fd56ad68d1f958481e17b3130c97ff8ac45b88a2d272c SOURCES/linux-6.12.0-62.el10.tar.xz
+92b5831e900e55c98a63dde34df52ccf66573fe7df472c38f5a742b50758a864 SOURCES/kernel-abi-stablelists-6.12.0-63.el10.tar.xz
+b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-63.el10.tar.xz
+11c810b55f72028f7016f4f440571a001c058f25855c6b739d5881d33c069039 SOURCES/linux-6.12.0-63.el10.tar.xz
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index c269783300fd2c78d161faaa4f7aedff52783e0b..8a99df51b472dddc368bd979db4a5f2b7c820b77 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 = 62
+RHEL_RELEASE = 63
#
# RHEL_REBASE_NUM
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index 09a002464c10d85110636ada2b0043572cab1e61..f7c29266686aff74e64290e8ff87d645323be2d4 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,7 @@
+* Tue Mar 11 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-63.el10]
+- block: Ensure start sector is aligned for stacking atomic writes (Nigel Croxon) [RHEL-73721]
+Resolves: RHEL-73721
+
* Mon Mar 10 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-62.el10]
- s390/pci: Fix handling of isolated VFs (Mete Durlu) [RHEL-81936]
- s390/pci: Pull search for parent PF out of zpci_iov_setup_virtfn() (Mete Durlu) [RHEL-81936]
@@ -30,7 +34,7 @@ Resolves: RHEL-75655, RHEL-75660, RHEL-76089, RHEL-76090, RHEL-78975, RHEL-79457
- 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-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime (CKI Backport Bot) [RHEL-81540] {CVE-2025-21712}
- 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]
@@ -59,7 +63,7 @@ Resolves: RHEL-75655, RHEL-75660, RHEL-76089, RHEL-76090, RHEL-78975, RHEL-79457
- 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
+Resolves: RHEL-41204, RHEL-47437, RHEL-71568, RHEL-73721, RHEL-76749, RHEL-80149, RHEL-80305, RHEL-80534, RHEL-80626, RHEL-81482, RHEL-81540, 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]
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index cdc734e7d848c415ab605ad00d8f2eca587f6dab..08112a3b525067307fca105d98344bfe4e3b3007 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 62
+%define pkgrelease 63
%define kversion 6
-%define tarfile_release 6.12.0-62.el10
+%define tarfile_release 6.12.0-63.el10
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 62%{?buildid}%{?dist}
+%define specrelease 63%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.12.0-62.el10
+%define kabiversion 6.12.0-63.el10
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -4314,11 +4314,14 @@ fi\
#
#
%changelog
-* Tue Mar 11 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-62
+* Fri Mar 14 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-63
- Porting to Rocky Linux 10, debranding and Rocky Linux branding
- Add partial riscv64 support for build root
- Provide basic VisionFive 2 support
+* Tue Mar 11 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-63.el10]
+- block: Ensure start sector is aligned for stacking atomic writes (Nigel Croxon) [RHEL-73721]
+
* Mon Mar 10 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-62.el10]
- s390/pci: Fix handling of isolated VFs (Mete Durlu) [RHEL-81936]
- s390/pci: Pull search for parent PF out of zpci_iov_setup_virtfn() (Mete Durlu) [RHEL-81936]
@@ -4350,7 +4353,7 @@ fi\
- 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-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime (CKI Backport Bot) [RHEL-81540] {CVE-2025-21712}
- 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]