diff --git a/.kernel.metadata b/.kernel.metadata
index 9326c03b995c95826037244c37432fb149be6c01..a2cced8bdcb337bd05ffc7ec252f1023a7fef580 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,3 +1,3 @@
-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
+2248f07af6d5d89be1fd3881f66043e7700e9d95b2d0658c2fbc517b79e9da30 SOURCES/kernel-abi-stablelists-6.12.0-64.el10.tar.xz
+b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-64.el10.tar.xz
+7b336beb3ddbd5107e7756d542787977972d5fd276585c883d60abd0bd47710b SOURCES/linux-6.12.0-64.el10.tar.xz
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index 8a99df51b472dddc368bd979db4a5f2b7c820b77..9d98aa5bd02976c705fca02851157590782d0937 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 = 63
+RHEL_RELEASE = 64
#
# RHEL_REBASE_NUM
diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config
index 1b9501c95a2d9e1084aaf5de5543006012764c99..b0be29470ea79e4ecd831c1f39657e895faef644 100644
--- a/SOURCES/kernel-s390x-zfcpdump-rhel.config
+++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config
@@ -4556,11 +4556,11 @@ CONFIG_PID_NS=y
# CONFIG_PING is not set
# CONFIG_PKCS7_TEST_KEY is not set
CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_PKEY_CCA=m
-CONFIG_PKEY_EP11=m
-CONFIG_PKEY_PCKMO=y
-CONFIG_PKEY_UV=m
-CONFIG_PKEY=y
+# CONFIG_PKEY_CCA is not set
+# CONFIG_PKEY_EP11 is not set
+# CONFIG_PKEY is not set
+# CONFIG_PKEY_PCKMO is not set
+# CONFIG_PKEY_UV is not set
# CONFIG_PL320_MBOX is not set
# CONFIG_PLATFORM_MHU is not set
CONFIG_PLAYSTATION_FF=y
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index f7c29266686aff74e64290e8ff87d645323be2d4..e82c8ed27014af94ea46c334211596f9cf8cf339 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,78 @@
+* Thu Mar 13 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-64.el10]
+- media: ipu-bridge: Remove unneeded conditional compilations (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- ACPI: bus: change the prototype for acpi_get_physical_device_location (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Add regulator support (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Add powerdown GPIO support (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Add camera orientation and sensor rotation controls (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Debug log chip ID (Kate Hsuan) [RHEL-77309]
+- media: mc: fix endpoint iteration (Kate Hsuan) [RHEL-77309]
+- media: ccs: Fail the probe on CCS static data parser failure (Kate Hsuan) [RHEL-77309]
+- media: ccs: Print a warning on CCS static data parser failure (Kate Hsuan) [RHEL-77309]
+- media: intel/ipu6: move some boot messages to debug level (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: intel/ipu6: remove cpu latency qos request on error (Kate Hsuan) [RHEL-77309 RHEL-81387] {CVE-2024-58004}
+- media: ccs: Fix cleanup order in ccs_probe() (Kate Hsuan) [RHEL-77309]
+- media: dt-bindings: Add property to describe CSI-2 C-PHY line orders (Kate Hsuan) [RHEL-77309]
+- media: v4l: fwnode: Parse MiPI DisCo for C-PHY line-orders (Kate Hsuan) [RHEL-77309]
+- media: ccs: Clean up parsed CCS static data on parse failure (Kate Hsuan) [RHEL-77309]
+- media: ccs: Fix CCS static data parsing for large block sizes (Kate Hsuan) [RHEL-77309]
+- media: replace obsolete hans.verkuil@cisco.com alias (Kate Hsuan) [RHEL-77309]
+- media: ipu6: make the ipu6_mmu_unmap() as a void function (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: optimize the IPU6 MMU unmapping flow (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: optimize the IPU6 MMU mapping flow (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: move the l2_unmap() up before l2_map() (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: mc: Rename pad as origin in __media_pipeline_start() (Kate Hsuan) [RHEL-77309]
+- media: intel/ipu6: remove buttress ish structure (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: intel/ipu6: do not handle interrupts when device is disabled (Kate Hsuan) [RHEL-77180 RHEL-77309] {CVE-2024-56680}
+- media: gspca: ov534-ov772x: Fix off-by-one error in set_frame_rate() (Kate Hsuan) [RHEL-77309]
+- media: i2c: Drop HAS_EVENTS and event handlers (Kate Hsuan) [RHEL-77309]
+- media: v4l2-subdev: Refactor events (Kate Hsuan) [RHEL-77309]
+- media: Documentation: ipu6: remove the dma_ops part from the doc (Kate Hsuan) [RHEL-77309]
+- media: ipu6: use PFN_UP() and sg_virt() for code simplicity (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: remove architecture DMA ops dependency in Kconfig (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: use the IPU6 DMA mapping APIs to do mapping (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: not override the dma_ops of device in driver (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: Fix DMA and physical address debugging messages for 32-bit (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ov2740: Don't log ov2740_check_hwcfg() errors twice (Kate Hsuan) [RHEL-77309]
+- convert media_request_get_by_fd() (Kate Hsuan) [RHEL-77309]
+- media: vb2: fix confusing log message (Kate Hsuan) [RHEL-77309]
+- media: vb2: Fix comment (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: constify the class struct (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: v4l2-dv-timings: check cvt/gtf result (Kate Hsuan) [RHEL-77309]
+- media: common: saa7146: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: platform: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: rtl2832_sdr: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: video-i2c: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: usb: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: pci: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: videobuf2-core: update vb2_thread if wait_finish/prepare are NULL (Kate Hsuan) [RHEL-77309]
+- media: ipu6: remove redundant dependency in Kconfig (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: fix the wrong type casting and 64-bit division (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- v4l2-subdev: Return -EOPNOTSUPP for unsupported pad type in call_get_frame_desc() (Kate Hsuan) [RHEL-77309]
+- media: i2c: Fix typos in comments across various files (Kate Hsuan) [RHEL-77309]
+- media: videodev2: Add flag to unconditionally enumerate pixel formats (Kate Hsuan) [RHEL-77309]
+- media: vb2: use lock if wait_prepare/finish are NULL (Kate Hsuan) [RHEL-77309]
+- media: vb2: vb2_core_queue_init(): sanity check lock and wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: pwc: set lock before calling vb2_queue_init() (Kate Hsuan) [RHEL-77309]
+- media: Documentation: Improve v4l2_subdev_{en,dis}able_streams documentation (Kate Hsuan) [RHEL-77309]
+- media: Documentation: tx-rx: Fix formatting (Kate Hsuan) [RHEL-77309]
+- media: Documentation: Update {enable,disable}_streams documentation (Kate Hsuan) [RHEL-77309]
+- media: Documentation: Deprecate s_stream video op, update docs (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: add v4l2_debugfs_if_alloc/free() (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: add v4l2_debugfs_root() (Kate Hsuan) [RHEL-77309]
+- media: v4l: Add luma 16-bit interlaced pixel format (Kate Hsuan) [RHEL-77309]
+- media: netup_unidvb: switch to use devm_spi_alloc_host() (Kate Hsuan) [RHEL-77309]
+- redhat/configs: Disable CONFIG_PKEY for zfcpdump configs (Mete Durlu) [RHEL-78341]
+- RDMA/mana_ib: Allocate PAGE aligned doorbell index (Maxim Levitsky) [RHEL-80097]
+- net: mana: Cleanup "mana" debugfs dir after cleanup of all children (Maxim Levitsky) [RHEL-80097]
+- net: mana: Fix irq_contexts memory leak in mana_gd_setup_irqs (Maxim Levitsky) [RHEL-80097]
+- net: mana: Fix memory leak in mana_gd_setup_irqs (Maxim Levitsky) [RHEL-80097]
+- net :mana :Request a V2 response version for MANA_QUERY_GF_STAT (Maxim Levitsky) [RHEL-80097]
+- net: mana: use ethtool string helpers (Maxim Levitsky) [RHEL-80097]
+- net: mana: Enable debugfs files for MANA device (Maxim Levitsky) [RHEL-80097]
+- net: mana: Add get_link and get_link_ksettings in ethtool (Maxim Levitsky) [RHEL-80097]
+- net: mana: Increase the DEF_RX_BUFFERS_PER_QUEUE to 1024 (Maxim Levitsky) [RHEL-80097]
+Resolves: RHEL-77180, RHEL-77309, RHEL-78341, RHEL-80097, RHEL-81387
+
* 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
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 08112a3b525067307fca105d98344bfe4e3b3007..2f011508199e00d96e3d4ba3656223fee6f7d4ac 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 63
+%define pkgrelease 64
%define kversion 6
-%define tarfile_release 6.12.0-63.el10
+%define tarfile_release 6.12.0-64.el10
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 63%{?buildid}%{?dist}
+%define specrelease 64%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.12.0-63.el10
+%define kabiversion 6.12.0-64.el10
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -4314,11 +4314,85 @@ fi\
#
#
%changelog
-* Fri Mar 14 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-63
+* Mon Mar 17 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-64
- Porting to Rocky Linux 10, debranding and Rocky Linux branding
- Add partial riscv64 support for build root
- Provide basic VisionFive 2 support
+* Thu Mar 13 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-64.el10]
+- media: ipu-bridge: Remove unneeded conditional compilations (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- ACPI: bus: change the prototype for acpi_get_physical_device_location (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Add regulator support (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Add powerdown GPIO support (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Add camera orientation and sensor rotation controls (Kate Hsuan) [RHEL-77309]
+- media: ov2740: Debug log chip ID (Kate Hsuan) [RHEL-77309]
+- media: mc: fix endpoint iteration (Kate Hsuan) [RHEL-77309]
+- media: ccs: Fail the probe on CCS static data parser failure (Kate Hsuan) [RHEL-77309]
+- media: ccs: Print a warning on CCS static data parser failure (Kate Hsuan) [RHEL-77309]
+- media: intel/ipu6: move some boot messages to debug level (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: intel/ipu6: remove cpu latency qos request on error (Kate Hsuan) [RHEL-77309 RHEL-81387] {CVE-2024-58004}
+- media: ccs: Fix cleanup order in ccs_probe() (Kate Hsuan) [RHEL-77309]
+- media: dt-bindings: Add property to describe CSI-2 C-PHY line orders (Kate Hsuan) [RHEL-77309]
+- media: v4l: fwnode: Parse MiPI DisCo for C-PHY line-orders (Kate Hsuan) [RHEL-77309]
+- media: ccs: Clean up parsed CCS static data on parse failure (Kate Hsuan) [RHEL-77309]
+- media: ccs: Fix CCS static data parsing for large block sizes (Kate Hsuan) [RHEL-77309]
+- media: replace obsolete hans.verkuil@cisco.com alias (Kate Hsuan) [RHEL-77309]
+- media: ipu6: make the ipu6_mmu_unmap() as a void function (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: optimize the IPU6 MMU unmapping flow (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: optimize the IPU6 MMU mapping flow (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: move the l2_unmap() up before l2_map() (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: mc: Rename pad as origin in __media_pipeline_start() (Kate Hsuan) [RHEL-77309]
+- media: intel/ipu6: remove buttress ish structure (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: intel/ipu6: do not handle interrupts when device is disabled (Kate Hsuan) [RHEL-77180 RHEL-77309] {CVE-2024-56680}
+- media: gspca: ov534-ov772x: Fix off-by-one error in set_frame_rate() (Kate Hsuan) [RHEL-77309]
+- media: i2c: Drop HAS_EVENTS and event handlers (Kate Hsuan) [RHEL-77309]
+- media: v4l2-subdev: Refactor events (Kate Hsuan) [RHEL-77309]
+- media: Documentation: ipu6: remove the dma_ops part from the doc (Kate Hsuan) [RHEL-77309]
+- media: ipu6: use PFN_UP() and sg_virt() for code simplicity (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: remove architecture DMA ops dependency in Kconfig (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: use the IPU6 DMA mapping APIs to do mapping (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: not override the dma_ops of device in driver (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: Fix DMA and physical address debugging messages for 32-bit (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ov2740: Don't log ov2740_check_hwcfg() errors twice (Kate Hsuan) [RHEL-77309]
+- convert media_request_get_by_fd() (Kate Hsuan) [RHEL-77309]
+- media: vb2: fix confusing log message (Kate Hsuan) [RHEL-77309]
+- media: vb2: Fix comment (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: constify the class struct (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: v4l2-dv-timings: check cvt/gtf result (Kate Hsuan) [RHEL-77309]
+- media: common: saa7146: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: platform: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: rtl2832_sdr: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: video-i2c: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: usb: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: pci: drop vb2_ops_wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: videobuf2-core: update vb2_thread if wait_finish/prepare are NULL (Kate Hsuan) [RHEL-77309]
+- media: ipu6: remove redundant dependency in Kconfig (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- media: ipu6: fix the wrong type casting and 64-bit division (Kate Hsuan) [RHEL-77180 RHEL-77309]
+- v4l2-subdev: Return -EOPNOTSUPP for unsupported pad type in call_get_frame_desc() (Kate Hsuan) [RHEL-77309]
+- media: i2c: Fix typos in comments across various files (Kate Hsuan) [RHEL-77309]
+- media: videodev2: Add flag to unconditionally enumerate pixel formats (Kate Hsuan) [RHEL-77309]
+- media: vb2: use lock if wait_prepare/finish are NULL (Kate Hsuan) [RHEL-77309]
+- media: vb2: vb2_core_queue_init(): sanity check lock and wait_prepare/finish (Kate Hsuan) [RHEL-77309]
+- media: pwc: set lock before calling vb2_queue_init() (Kate Hsuan) [RHEL-77309]
+- media: Documentation: Improve v4l2_subdev_{en,dis}able_streams documentation (Kate Hsuan) [RHEL-77309]
+- media: Documentation: tx-rx: Fix formatting (Kate Hsuan) [RHEL-77309]
+- media: Documentation: Update {enable,disable}_streams documentation (Kate Hsuan) [RHEL-77309]
+- media: Documentation: Deprecate s_stream video op, update docs (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: add v4l2_debugfs_if_alloc/free() (Kate Hsuan) [RHEL-77309]
+- media: v4l2-core: add v4l2_debugfs_root() (Kate Hsuan) [RHEL-77309]
+- media: v4l: Add luma 16-bit interlaced pixel format (Kate Hsuan) [RHEL-77309]
+- media: netup_unidvb: switch to use devm_spi_alloc_host() (Kate Hsuan) [RHEL-77309]
+- redhat/configs: Disable CONFIG_PKEY for zfcpdump configs (Mete Durlu) [RHEL-78341]
+- RDMA/mana_ib: Allocate PAGE aligned doorbell index (Maxim Levitsky) [RHEL-80097]
+- net: mana: Cleanup "mana" debugfs dir after cleanup of all children (Maxim Levitsky) [RHEL-80097]
+- net: mana: Fix irq_contexts memory leak in mana_gd_setup_irqs (Maxim Levitsky) [RHEL-80097]
+- net: mana: Fix memory leak in mana_gd_setup_irqs (Maxim Levitsky) [RHEL-80097]
+- net :mana :Request a V2 response version for MANA_QUERY_GF_STAT (Maxim Levitsky) [RHEL-80097]
+- net: mana: use ethtool string helpers (Maxim Levitsky) [RHEL-80097]
+- net: mana: Enable debugfs files for MANA device (Maxim Levitsky) [RHEL-80097]
+- net: mana: Add get_link and get_link_ksettings in ethtool (Maxim Levitsky) [RHEL-80097]
+- net: mana: Increase the DEF_RX_BUFFERS_PER_QUEUE to 1024 (Maxim Levitsky) [RHEL-80097]
+
* 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]