diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 1267aae79..ca2288d79 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -2898,7 +2898,7 @@ CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_PWM_TX=m
 # CONFIG_IRQSOFF_TRACER is not set
-CONFIG_IRQ_STACKS=y
+# CONFIG_IRQ_STACKS is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index 8dd0add54..1c59e4bdb 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -2878,7 +2878,7 @@ CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_PWM_TX=m
 # CONFIG_IRQSOFF_TRACER is not set
-CONFIG_IRQ_STACKS=y
+# CONFIG_IRQ_STACKS is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
diff --git a/kernel.spec b/kernel.spec
index 33b072f19..c3db2d6f1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -180,7 +180,7 @@ Summary: The Linux kernel
 # This is needed to do merge window version magic
 %define patchlevel 5
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.30%{?buildid}.4.riscv64%{?dist}
+%define specrelease 0.rc4.30%{?buildid}.5.riscv64%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.5.0
 
diff --git a/linux-kernel-test.patch b/linux-kernel-test.patch
index 0f3da25c3..db239f73d 100644
--- a/linux-kernel-test.patch
+++ b/linux-kernel-test.patch
@@ -148,3 +148,16 @@ index e1484905b7bd..c2673fdad8e5 100644
  	.irq_mask	= plic_irq_mask,
  	.irq_unmask	= plic_irq_unmask,
  	.irq_eoi	= plic_irq_eoi,
+diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
+index 4c07b9189..7dba17e40 100644
+--- a/arch/riscv/Kconfig
++++ b/arch/riscv/Kconfig
+@@ -600,7 +600,7 @@ config FPU
+ 
+ config IRQ_STACKS
+ 	bool "Independent irq & softirq stacks" if EXPERT
+-	default y
++	default n
+ 	select HAVE_IRQ_EXIT_ON_IRQ_STACK
+ 	select HAVE_SOFTIRQ_ON_OWN_STACK
+ 	help