From 4b56461c2e27f7e9351c37eaa3f768abd016db6b Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Mon, 31 Mar 2025 18:43:58 +0000
Subject: [PATCH] import kernel-6.12.0-69.el10

---
 .kernel.metadata                              |  6 +-
 SOURCES/Makefile.rhelver                      |  2 +-
 SOURCES/kernel-aarch64-64k-debug-rhel.config  |  1 +
 SOURCES/kernel-aarch64-64k-rhel.config        |  1 +
 ...ernel-aarch64-automotive-debug-rhel.config |  1 +
 SOURCES/kernel-aarch64-automotive-rhel.config |  1 +
 SOURCES/kernel-aarch64-debug-rhel.config      |  1 +
 SOURCES/kernel-aarch64-rhel.config            |  1 +
 .../kernel-aarch64-rt-64k-debug-rhel.config   |  1 +
 SOURCES/kernel-aarch64-rt-64k-rhel.config     |  1 +
 SOURCES/kernel-aarch64-rt-debug-rhel.config   |  1 +
 SOURCES/kernel-aarch64-rt-rhel.config         |  1 +
 SOURCES/kernel-ppc64le-debug-rhel.config      |  1 +
 SOURCES/kernel-ppc64le-rhel.config            |  1 +
 SOURCES/kernel-riscv64-debug-rhel.config      |  1 +
 SOURCES/kernel-riscv64-rhel.config            |  1 +
 SOURCES/kernel-s390x-debug-rhel.config        |  1 +
 SOURCES/kernel-s390x-rhel.config              |  1 +
 SOURCES/kernel-s390x-zfcpdump-rhel.config     |  1 +
 ...kernel-x86_64-automotive-debug-rhel.config |  1 +
 SOURCES/kernel-x86_64-automotive-rhel.config  |  1 +
 SOURCES/kernel-x86_64-debug-rhel.config       |  1 +
 SOURCES/kernel-x86_64-rhel.config             |  1 +
 SOURCES/kernel-x86_64-rt-debug-rhel.config    |  1 +
 SOURCES/kernel-x86_64-rt-rhel.config          |  1 +
 SOURCES/kernel.changelog                      | 66 ++++++++++++++++
 SPECS/kernel.spec                             | 75 +++++++++++++++++--
 27 files changed, 163 insertions(+), 9 deletions(-)

diff --git a/.kernel.metadata b/.kernel.metadata
index d3d3db8..167b0cb 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,3 +1,3 @@
-c57c9d062d923182ccd1f1e535599c7a255c955946a890a1523e13648f547b81 SOURCES/kernel-abi-stablelists-6.12.0-68.el10.tar.xz
-b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-68.el10.tar.xz
-1d5d01865bf5bb2cf2cf321a32d642d0739335d35135940bae22664db6986ad0 SOURCES/linux-6.12.0-68.el10.tar.xz
+c59cf445f5c9007043fb660ee39ce45f5aab747699d110b1e7803a8b54a80fea SOURCES/kernel-abi-stablelists-6.12.0-69.el10.tar.xz
+b6876512800e2b776d02c7fde5add55a244099303fe394077ba6a99c1f9d3065 SOURCES/kernel-kabi-dw-6.12.0-69.el10.tar.xz
+81e5e1271cb0aff8ce176aab998a0f2eca2d0b8bd9266dfdc8b7917d3cf31633 SOURCES/linux-6.12.0-69.el10.tar.xz
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index d2a347d..0d7171b 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 = 68
+RHEL_RELEASE = 69
 
 #
 # RHEL_REBASE_NUM
diff --git a/SOURCES/kernel-aarch64-64k-debug-rhel.config b/SOURCES/kernel-aarch64-64k-debug-rhel.config
index 69edd10..62345c8 100644
--- a/SOURCES/kernel-aarch64-64k-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-64k-debug-rhel.config
@@ -626,6 +626,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-64k-rhel.config b/SOURCES/kernel-aarch64-64k-rhel.config
index 93735ee..154140b 100644
--- a/SOURCES/kernel-aarch64-64k-rhel.config
+++ b/SOURCES/kernel-aarch64-64k-rhel.config
@@ -626,6 +626,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-automotive-debug-rhel.config b/SOURCES/kernel-aarch64-automotive-debug-rhel.config
index 7de2147..fac2901 100644
--- a/SOURCES/kernel-aarch64-automotive-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-automotive-debug-rhel.config
@@ -671,6 +671,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-automotive-rhel.config b/SOURCES/kernel-aarch64-automotive-rhel.config
index 0104140..03c4fc9 100644
--- a/SOURCES/kernel-aarch64-automotive-rhel.config
+++ b/SOURCES/kernel-aarch64-automotive-rhel.config
@@ -671,6 +671,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config
index d87912a..7d44b37 100644
--- a/SOURCES/kernel-aarch64-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-debug-rhel.config
@@ -624,6 +624,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config
index ddae702..8a45266 100644
--- a/SOURCES/kernel-aarch64-rhel.config
+++ b/SOURCES/kernel-aarch64-rhel.config
@@ -624,6 +624,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-rt-64k-debug-rhel.config b/SOURCES/kernel-aarch64-rt-64k-debug-rhel.config
index e453850..df067f6 100644
--- a/SOURCES/kernel-aarch64-rt-64k-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-rt-64k-debug-rhel.config
@@ -626,6 +626,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-rt-64k-rhel.config b/SOURCES/kernel-aarch64-rt-64k-rhel.config
index 24ff730..d2766ec 100644
--- a/SOURCES/kernel-aarch64-rt-64k-rhel.config
+++ b/SOURCES/kernel-aarch64-rt-64k-rhel.config
@@ -626,6 +626,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-rt-debug-rhel.config b/SOURCES/kernel-aarch64-rt-debug-rhel.config
index c3328e9..232c358 100644
--- a/SOURCES/kernel-aarch64-rt-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-rt-debug-rhel.config
@@ -624,6 +624,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-aarch64-rt-rhel.config b/SOURCES/kernel-aarch64-rt-rhel.config
index bd3e784..3951989 100644
--- a/SOURCES/kernel-aarch64-rt-rhel.config
+++ b/SOURCES/kernel-aarch64-rt-rhel.config
@@ -624,6 +624,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config
index 393d3fd..7e47eac 100644
--- a/SOURCES/kernel-ppc64le-debug-rhel.config
+++ b/SOURCES/kernel-ppc64le-debug-rhel.config
@@ -468,6 +468,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config
index dbdd5a3..9cd988c 100644
--- a/SOURCES/kernel-ppc64le-rhel.config
+++ b/SOURCES/kernel-ppc64le-rhel.config
@@ -468,6 +468,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-riscv64-debug-rhel.config b/SOURCES/kernel-riscv64-debug-rhel.config
index 3649a43..f6269ec 100644
--- a/SOURCES/kernel-riscv64-debug-rhel.config
+++ b/SOURCES/kernel-riscv64-debug-rhel.config
@@ -572,6 +572,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
diff --git a/SOURCES/kernel-riscv64-rhel.config b/SOURCES/kernel-riscv64-rhel.config
index 953cc4e..8d3a52f 100644
--- a/SOURCES/kernel-riscv64-rhel.config
+++ b/SOURCES/kernel-riscv64-rhel.config
@@ -570,6 +570,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_BLK_CGROUP_IOPRIO=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config
index 08d4f4c..0be944e 100644
--- a/SOURCES/kernel-s390x-debug-rhel.config
+++ b/SOURCES/kernel-s390x-debug-rhel.config
@@ -467,6 +467,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config
index a326ea0..8723f6d 100644
--- a/SOURCES/kernel-s390x-rhel.config
+++ b/SOURCES/kernel-s390x-rhel.config
@@ -467,6 +467,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config
index f572787..3f39b5c 100644
--- a/SOURCES/kernel-s390x-zfcpdump-rhel.config
+++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config
@@ -468,6 +468,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-x86_64-automotive-debug-rhel.config b/SOURCES/kernel-x86_64-automotive-debug-rhel.config
index 3ba889e..6fdaac4 100644
--- a/SOURCES/kernel-x86_64-automotive-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-automotive-debug-rhel.config
@@ -507,6 +507,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-x86_64-automotive-rhel.config b/SOURCES/kernel-x86_64-automotive-rhel.config
index 1e5e990..f7baa2b 100644
--- a/SOURCES/kernel-x86_64-automotive-rhel.config
+++ b/SOURCES/kernel-x86_64-automotive-rhel.config
@@ -507,6 +507,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config
index 307b426..9859db7 100644
--- a/SOURCES/kernel-x86_64-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-debug-rhel.config
@@ -496,6 +496,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config
index 82f27f1..f9b228c 100644
--- a/SOURCES/kernel-x86_64-rhel.config
+++ b/SOURCES/kernel-x86_64-rhel.config
@@ -496,6 +496,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-x86_64-rt-debug-rhel.config b/SOURCES/kernel-x86_64-rt-debug-rhel.config
index bc5cedf..a3cbd0c 100644
--- a/SOURCES/kernel-x86_64-rt-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-rt-debug-rhel.config
@@ -496,6 +496,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel-x86_64-rt-rhel.config b/SOURCES/kernel-x86_64-rt-rhel.config
index e053dbb..1e888a2 100644
--- a/SOURCES/kernel-x86_64-rt-rhel.config
+++ b/SOURCES/kernel-x86_64-rt-rhel.config
@@ -496,6 +496,7 @@ CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index e15bcf9..b55ef74 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,69 @@
+* Fri Mar 28 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-69.el10]
+- redhat/configs: Enable CONFIG_BLK_CGROUP_PUNT_BIO (Neal Gompa) [RHEL-79711]
+- block/Kconfig: Allow selecting BLK_CGROUP_PUNT_BIO (Neal Gompa) [RHEL-79711]
+- perf script: Fix hangup in offline flamegraph report (Michael Petlan) [RHEL-57021]
+- perf script: force stdin for flamegraph in live mode (Michael Petlan) [RHEL-57021]
+- smb: client: fix regression with guest option (Paulo Alcantara) [RHEL-83856]
+- KVM: selftests: Allow running a single iteration of dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Fix an off-by-one in the number of dirty_log_test iterations (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Set per-iteration variables at the start of each iteration (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Tighten checks around prev iter's last dirty page in ring (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Ensure guest writes min number of pages in dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: sefltests: Verify value of dirty_log_test last page isn't bogus (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Collect *all* dirty entries in each dirty_log_test iteration (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Print (previous) last_page on dirty page value mismatch (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Use continue to handle all "pass" scenarios in dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Post to sem_vcpu_stop if and only if vcpu_stop is true (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Keep dirty_log_test vCPU in guest until it needs to stop (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Honor "stop" request in dirty ring test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Limit dirty_log_test's s390x workaround to s390x (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Continuously reap dirty ring while vCPU is running (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Read per-page value into local var when verifying dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Precisely track number of dirty/clear pages for each iteration (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Drop stale srandom() initialization from dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Drop signal/kick from dirty ring testcase (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Sync dirty_log_test iteration to guest *before* resuming (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Support multiple write retires in dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: VMX: read the PML log in the same order as it was written (Maxim Levitsky) [RHEL-58941]
+- KVM: VMX: refactor PML terminology (Maxim Levitsky) [RHEL-58941]
+- crypto: pcrypt - Call crypto layer directly when padata_do_parallel() return -EBUSY (Herbert Xu) [RHEL-80114] {CVE-2024-56690}
+- erofs: fix blksize < PAGE_SIZE for file-backed mounts (Ian Kent) [RHEL-82421] {CVE-2024-56750}
+- platform/x86/intel/vsec: Add support for Panther Lake (Steve Best) [RHEL-47411]
+- bonding: report duplicate MAC address in all situations (Hangbin Liu) [RHEL-73803]
+- ice: Fix signedness bug in ice_init_interrupt_scheme() (Petr Oros) [RHEL-80554]
+- ice: init flow director before RDMA (Petr Oros) [RHEL-80554]
+- ice: simplify VF MSI-X managing (Petr Oros) [RHEL-80554]
+- ice: enable_rdma devlink param (Petr Oros) [RHEL-80554]
+- ice: treat dyn_allowed only as suggestion (Petr Oros) [RHEL-80554]
+- ice, irdma: move interrupts code to irdma (Petr Oros) [RHEL-80554]
+- ice: get rid of num_lan_msix field (Petr Oros) [RHEL-80554]
+- ice: remove splitting MSI-X between features (Petr Oros) [RHEL-80554]
+- ice: devlink PF MSI-X max and min parameter (Petr Oros) [RHEL-80554]
+- ice: ice_probe: init ice_adapter after HW init (Petr Oros) [RHEL-80554]
+- ice: minor: rename goto labels from err to unroll (Petr Oros) [RHEL-80554]
+- ice: split ice_init_hw() out from ice_init_dev() (Petr Oros) [RHEL-80554]
+- ice: c827: move wait for FW to ice_init_hw() (Petr Oros) [RHEL-80554]
+- ipv6: use RCU protection in ip6_default_advmss() (Guillaume Nault) [RHEL-81574] {CVE-2025-21765}
+- net: add dev_net_rcu() helper (Guillaume Nault) [RHEL-81574] {CVE-2025-21765}
+- objtool: Add bch2_trans_unlocked_error() to bcachefs noreturns (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Exclude __tracepoints data from ENDBR checks (Radomir Vrbovsky) [RHEL-80715]
+- kbuild: Add Propeller configuration for kernel build (Radomir Vrbovsky) [RHEL-80715]
+- AutoFDO: Enable machine function split optimization for AutoFDO (Radomir Vrbovsky) [RHEL-80715]
+- AutoFDO: Enable -ffunction-sections for the AutoFDO build (Radomir Vrbovsky) [RHEL-80715]
+- vmlinux.lds.h: Add markers for text_unlikely and text_hot sections (Radomir Vrbovsky) [RHEL-80715]
+- openrisc: place exception table at the head of vmlinux (Radomir Vrbovsky) [RHEL-80715]
+- vmlinux.lds.h: Adjust symbol ordering in text output section (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Fix unreachable instruction warnings for weak functions (Radomir Vrbovsky) [RHEL-80715]
+- kbuild: Add AutoFDO support for Clang build (Radomir Vrbovsky) [RHEL-80715]
+- reiserfs: The last commit (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Also include tools/include/uapi (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Detect non-relocated text references (Radomir Vrbovsky) [RHEL-80715]
+- arch/x86/kernel/setup.c: fix rh_check_supported (Tomas Henzl) [RHEL-80866]
+- intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly (Steve Best) [RHEL-79459]
+- intel_idle: add Clearwater Forest SoC support (Steve Best) [RHEL-79459]
+- selftests: fib_nexthops: do not mark skipped tests as failed (Hangbin Liu) [RHEL-80288]
+Resolves: RHEL-47411, RHEL-57021, RHEL-58941, RHEL-73803, RHEL-79459, RHEL-79711, RHEL-80114, RHEL-80288, RHEL-80554, RHEL-80715, RHEL-80866, RHEL-81574, RHEL-82421, RHEL-83856
+
 * Mon Mar 24 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-68.el10]
 - platform/x86/intel: pmc: fix ltr decode in pmc_core_ltr_show() (Steve Best) [RHEL-79463]
 - platform/x86: intel/pmc: Fix ioremap() of bad address (Steve Best) [RHEL-79463]
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index f6cd6c6..b7ff288 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 68
+%define pkgrelease 69
 %define kversion 6
-%define tarfile_release 6.12.0-68.el10
+%define tarfile_release 6.12.0-69.el10
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 68%{?buildid}%{?dist}
+%define specrelease 69%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.12.0-68.el10
+%define kabiversion 6.12.0-69.el10
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -4314,11 +4314,76 @@ fi\
 #
 #
 %changelog
-* Sat Mar 29 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-68
+* Mon Mar 31 2025 Release Engineering <releng@rockylinux.org> - 6.12.0-69
 - Porting to Rocky Linux 10, debranding and Rocky Linux branding
 - Add partial riscv64 support for build root
 - Provide basic VisionFive 2 support
 
+* Fri Mar 28 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-69.el10]
+- redhat/configs: Enable CONFIG_BLK_CGROUP_PUNT_BIO (Neal Gompa) [RHEL-79711]
+- block/Kconfig: Allow selecting BLK_CGROUP_PUNT_BIO (Neal Gompa) [RHEL-79711]
+- perf script: Fix hangup in offline flamegraph report (Michael Petlan) [RHEL-57021]
+- perf script: force stdin for flamegraph in live mode (Michael Petlan) [RHEL-57021]
+- smb: client: fix regression with guest option (Paulo Alcantara) [RHEL-83856]
+- KVM: selftests: Allow running a single iteration of dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Fix an off-by-one in the number of dirty_log_test iterations (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Set per-iteration variables at the start of each iteration (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Tighten checks around prev iter's last dirty page in ring (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Ensure guest writes min number of pages in dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: sefltests: Verify value of dirty_log_test last page isn't bogus (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Collect *all* dirty entries in each dirty_log_test iteration (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Print (previous) last_page on dirty page value mismatch (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Use continue to handle all "pass" scenarios in dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Post to sem_vcpu_stop if and only if vcpu_stop is true (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Keep dirty_log_test vCPU in guest until it needs to stop (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Honor "stop" request in dirty ring test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Limit dirty_log_test's s390x workaround to s390x (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Continuously reap dirty ring while vCPU is running (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Read per-page value into local var when verifying dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Precisely track number of dirty/clear pages for each iteration (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Drop stale srandom() initialization from dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Drop signal/kick from dirty ring testcase (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Sync dirty_log_test iteration to guest *before* resuming (Maxim Levitsky) [RHEL-58941]
+- KVM: selftests: Support multiple write retires in dirty_log_test (Maxim Levitsky) [RHEL-58941]
+- KVM: VMX: read the PML log in the same order as it was written (Maxim Levitsky) [RHEL-58941]
+- KVM: VMX: refactor PML terminology (Maxim Levitsky) [RHEL-58941]
+- crypto: pcrypt - Call crypto layer directly when padata_do_parallel() return -EBUSY (Herbert Xu) [RHEL-80114] {CVE-2024-56690}
+- erofs: fix blksize < PAGE_SIZE for file-backed mounts (Ian Kent) [RHEL-82421] {CVE-2024-56750}
+- platform/x86/intel/vsec: Add support for Panther Lake (Steve Best) [RHEL-47411]
+- bonding: report duplicate MAC address in all situations (Hangbin Liu) [RHEL-73803]
+- ice: Fix signedness bug in ice_init_interrupt_scheme() (Petr Oros) [RHEL-80554]
+- ice: init flow director before RDMA (Petr Oros) [RHEL-80554]
+- ice: simplify VF MSI-X managing (Petr Oros) [RHEL-80554]
+- ice: enable_rdma devlink param (Petr Oros) [RHEL-80554]
+- ice: treat dyn_allowed only as suggestion (Petr Oros) [RHEL-80554]
+- ice, irdma: move interrupts code to irdma (Petr Oros) [RHEL-80554]
+- ice: get rid of num_lan_msix field (Petr Oros) [RHEL-80554]
+- ice: remove splitting MSI-X between features (Petr Oros) [RHEL-80554]
+- ice: devlink PF MSI-X max and min parameter (Petr Oros) [RHEL-80554]
+- ice: ice_probe: init ice_adapter after HW init (Petr Oros) [RHEL-80554]
+- ice: minor: rename goto labels from err to unroll (Petr Oros) [RHEL-80554]
+- ice: split ice_init_hw() out from ice_init_dev() (Petr Oros) [RHEL-80554]
+- ice: c827: move wait for FW to ice_init_hw() (Petr Oros) [RHEL-80554]
+- ipv6: use RCU protection in ip6_default_advmss() (Guillaume Nault) [RHEL-81574] {CVE-2025-21765}
+- net: add dev_net_rcu() helper (Guillaume Nault) [RHEL-81574] {CVE-2025-21765}
+- objtool: Add bch2_trans_unlocked_error() to bcachefs noreturns (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Exclude __tracepoints data from ENDBR checks (Radomir Vrbovsky) [RHEL-80715]
+- kbuild: Add Propeller configuration for kernel build (Radomir Vrbovsky) [RHEL-80715]
+- AutoFDO: Enable machine function split optimization for AutoFDO (Radomir Vrbovsky) [RHEL-80715]
+- AutoFDO: Enable -ffunction-sections for the AutoFDO build (Radomir Vrbovsky) [RHEL-80715]
+- vmlinux.lds.h: Add markers for text_unlikely and text_hot sections (Radomir Vrbovsky) [RHEL-80715]
+- openrisc: place exception table at the head of vmlinux (Radomir Vrbovsky) [RHEL-80715]
+- vmlinux.lds.h: Adjust symbol ordering in text output section (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Fix unreachable instruction warnings for weak functions (Radomir Vrbovsky) [RHEL-80715]
+- kbuild: Add AutoFDO support for Clang build (Radomir Vrbovsky) [RHEL-80715]
+- reiserfs: The last commit (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Also include tools/include/uapi (Radomir Vrbovsky) [RHEL-80715]
+- objtool: Detect non-relocated text references (Radomir Vrbovsky) [RHEL-80715]
+- arch/x86/kernel/setup.c: fix rh_check_supported (Tomas Henzl) [RHEL-80866]
+- intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly (Steve Best) [RHEL-79459]
+- intel_idle: add Clearwater Forest SoC support (Steve Best) [RHEL-79459]
+- selftests: fib_nexthops: do not mark skipped tests as failed (Hangbin Liu) [RHEL-80288]
+
 * Mon Mar 24 2025 Julio Faracco <jfaracco@redhat.com> [6.12.0-68.el10]
 - platform/x86/intel: pmc: fix ltr decode in pmc_core_ltr_show() (Steve Best) [RHEL-79463]
 - platform/x86: intel/pmc: Fix ioremap() of bad address (Steve Best) [RHEL-79463]
-- 
GitLab