diff --git a/ciq/SPECS/kernel-clk6.18.spec b/ciq/SPECS/kernel-clk6.18.spec
index 994cd5e842262..45f03d4a83eaa 100644
--- a/ciq/SPECS/kernel-clk6.18.spec
+++ b/ciq/SPECS/kernel-clk6.18.spec
@@ -171,7 +171,7 @@ Summary: The Linux kernel
 %define kernel_patch 38
 %define buildid .1
 %define specversion %{kernel_major_minor}.%{kernel_patch}
-%define pkgrelease 1%{?buildid}
+%define pkgrelease 2%{?buildid}
 %define kversion %{lua:print((rpm.expand("%{kernel_major_minor}"):match("^(%d+)")))}
 
 %define tarfile_release %{specversion}-%{pkgrelease}.el%{el_version}
@@ -4575,6 +4575,10 @@ fi\
 #
 #
 %changelog
+* Fri Jul 10 2026 Brett Mastbergen <bmastbergen@ciq.com> - 6.18.38-2.1.el9
+-- futex/requeue: Revert "Prevent NULL pointer dereference in remove_waiter() on self-deadlock"" (Brett Mastbergen)
+-- Add x86_64 minimal kernel variant to spec (Brett Mastbergen)
+
 * Sun Jul 05 2026 github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - 6.18.38-1.1.el9
 -- Rebased changes for Linux 6.18.38 (https://github.com/ctrliq/kernel-src-tree/releases/tag/ciq_kernel-6.18.38-1)
 -- [CIQ] v6.18.36 - updated spec (Brett Mastbergen)
diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c
index 1d99a84dc9adb..b597cb3d17fc1 100644
--- a/kernel/futex/requeue.c
+++ b/kernel/futex/requeue.c
@@ -643,12 +643,6 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags1,
 				continue;
 			}
 
-			/* Self-deadlock: non-top waiter already owns the PI futex. */
-			if (rt_mutex_owner(&pi_state->pi_mutex) == this->task) {
-				ret = -EDEADLK;
-				break;
-			}
-
 			ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex,
 							this->rt_waiter,
 							this->task);