diff --git a/Makefile.rhelver b/Makefile.rhelver
index 0b66c1253..5131b7d26 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 2
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 203
+RHEL_RELEASE = 204
 
 #
 # RHEL_REBASE_NUM
diff --git a/def_variants.yaml.rhel b/def_variants.yaml.rhel
index 1c2fd7c75..ceb025702 100644
--- a/def_variants.yaml.rhel
+++ b/def_variants.yaml.rhel
@@ -439,6 +439,7 @@ rules:
   - net/dns_resolver/.*: modules-core
   - net/hsr/.*: modules-core
   - net/ife/.*: modules-core
+  - net/ipv4/fou.ko: modules-extra
   - net/ipv4/netfilter/arp.*: modules-extra
   - net/ipv4/netfilter/ip[_t].*: modules-extra
   - net/ipv4/tcp_bic.*: modules-extra
@@ -453,6 +454,7 @@ rules:
   - net/ipv4/tcp_westwood.*: modules-extra
   - net/ipv4/tcp_yeah.*: modules-extra
   - net/ipv4/.*: modules-core
+  - net/ipv6/fou6.ko: modules-extra
   - net/ipv6/netfilter/ebt.*: modules-extra
   - net/ipv6/netfilter/ip6[_t].*: modules-extra
   - net/ipv6/.*: modules-core
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 73d2250a2..b1f01285c 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -1510,6 +1510,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVPORT is not set
@@ -4440,8 +4446,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5198,7 +5204,8 @@ CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index adf086c08..97c7676b4 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -37,7 +37,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DOCK is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
@@ -1502,6 +1502,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
@@ -4419,8 +4425,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5175,7 +5181,8 @@ CONFIG_PLAYSTATION_FF=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 24f0b43c1..6f335cea8 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1508,6 +1508,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVPORT is not set
@@ -4437,8 +4443,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5194,7 +5200,8 @@ CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 181038776..9b8019095 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -37,7 +37,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DOCK is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
@@ -1500,6 +1500,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
@@ -4416,8 +4422,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5171,7 +5177,8 @@ CONFIG_PLAYSTATION_FF=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-aarch64-rt-64k-debug-rhel.config b/kernel-aarch64-rt-64k-debug-rhel.config
index 94992760e..d15495a16 100644
--- a/kernel-aarch64-rt-64k-debug-rhel.config
+++ b/kernel-aarch64-rt-64k-debug-rhel.config
@@ -1512,6 +1512,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVPORT is not set
@@ -4481,8 +4487,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5239,7 +5245,8 @@ CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-aarch64-rt-64k-rhel.config b/kernel-aarch64-rt-64k-rhel.config
index 91e225b3f..c55079c27 100644
--- a/kernel-aarch64-rt-64k-rhel.config
+++ b/kernel-aarch64-rt-64k-rhel.config
@@ -37,7 +37,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DOCK is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
@@ -1504,6 +1504,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
@@ -4460,8 +4466,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5216,7 +5222,8 @@ CONFIG_PLAYSTATION_FF=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 90ea20931..037cae877 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -1510,6 +1510,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVPORT is not set
@@ -4478,8 +4484,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5235,7 +5241,8 @@ CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 72f97e140..d9598d088 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -37,7 +37,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DOCK is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
@@ -1502,6 +1502,12 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+# CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
@@ -4457,8 +4463,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
@@ -5212,7 +5218,8 @@ CONFIG_PLAYSTATION_FF=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_OPREGION is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 9109a4a80..61a830f53 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4065,8 +4065,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 2a4ff5d27..b059366b4 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -35,7 +35,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
@@ -4045,8 +4045,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-riscv64-debug-rhel.config b/kernel-riscv64-debug-rhel.config
index 0b1c84069..307fc95a4 100644
--- a/kernel-riscv64-debug-rhel.config
+++ b/kernel-riscv64-debug-rhel.config
@@ -4025,8 +4025,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-riscv64-rhel.config b/kernel-riscv64-rhel.config
index c250286b2..07b2925e9 100644
--- a/kernel-riscv64-rhel.config
+++ b/kernel-riscv64-rhel.config
@@ -35,7 +35,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DOCK is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
@@ -4005,8 +4005,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index b1473986b..ba308d5d1 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4045,8 +4045,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index d9250943d..e926fb1ca 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -34,7 +34,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
@@ -4025,8 +4025,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index aee88c1b2..dc257cc10 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -34,7 +34,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
@@ -4034,8 +4034,8 @@ CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 # CONFIG_NETFS_SUPPORT is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 2941c788d..886a6b409 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4339,8 +4339,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index dba007a59..0d0469d10 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -37,7 +37,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_DPTF=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
@@ -4319,8 +4319,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index ae9140005..22b19c5c0 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -4380,8 +4380,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index ee73d2331..5476f216e 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -37,7 +37,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DEBUGGER_USER is not set
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_DPTF=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
@@ -4360,8 +4360,8 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER=y
 CONFIG_NET_FLOW_LIMIT=y
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_NET_FOU is not set
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_NET_FOU=m
 # CONFIG_NETFS_DEBUG is not set
 CONFIG_NETFS_STATS=y
 CONFIG_NETFS_SUPPORT=m
diff --git a/kernel.changelog b/kernel.changelog
index 103775762..7317e4c92 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,36 @@
+* Wed Feb 11 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-204.el10]
+- netlink: avoid infinite retry looping in netlink_unicast() (Paolo Abeni) [RHEL-133487] {CVE-2025-38727}
+- netlink: make sure we allow at least one dump skb (Paolo Abeni) [RHEL-133487]
+- netlink: Fix rmem check in netlink_broadcast_deliver(). (Paolo Abeni) [RHEL-133487]
+- netlink: Fix wraparounds of sk->sk_rmem_alloc. (Paolo Abeni) [RHEL-133487]
+- genetlink: fix genl_bind() invoking bind() after -EPERM (Paolo Abeni) [RHEL-133487] {CVE-2025-39926}
+- nvme: add support for dynamic quirk configuration via module parameter (Maurizio Lombardi) [RHEL-126507]
+- nvme: expose active quirks in sysfs (Maurizio Lombardi) [RHEL-141683]
+- block: fix memory leak in __blkdev_issue_zero_pages (Ming Lei) [RHEL-137852]
+- virtio: clean up features qword/dword terms (Laurent Vivier) [RHEL-111004]
+- virtio-net: avoid unnecessary checksum calculation on guest RX (Laurent Vivier) [RHEL-111004]
+- virtio_net: fix alignment for virtio_net_hdr_v1_hash (Laurent Vivier) [RHEL-111004]
+- virtio-net: zero unused hash fields (Laurent Vivier) [RHEL-111004]
+- vhost/net: enable gso over UDP tunnel support. (Laurent Vivier) [RHEL-111004]
+- tun: enable gso over UDP tunnel support. (Laurent Vivier) [RHEL-111004]
+- virtio_net: enable gso over UDP tunnel support. (Laurent Vivier) [RHEL-111004]
+- net: implement virtio helpers to handle UDP GSO tunneling. (Laurent Vivier) [RHEL-111004]
+- virtio_net: add supports for extended offloads (Laurent Vivier) [RHEL-111004]
+- vhost-net: allow configuring extended features (Laurent Vivier) [RHEL-111004]
+- virtio_pci_modern: allow configuring extended features (Laurent Vivier) [RHEL-111004]
+- virtio: introduce extended features (Laurent Vivier) [RHEL-111004]
+- fou: Don't allow 0 for FOU_ATTR_IPPROTO. (Xin Long) [RHEL-142435]
+- tools: ynl: Specify --no-line-number in ynl-regen.sh. (Xin Long) [RHEL-142435]
+- gue: Fix skb memleak with inner IP protocol 0. (Xin Long) [RHEL-142435]
+- netlink: specs: fou: replace underscores with dashes in names (Xin Long) [RHEL-142435]
+- redhat: enable FOU modules in kernel-modules-extra (Xin Long) [RHEL-142435]
+- xfs: set max_agbno to allow sparse alloc of last full inode chunk (CKI Backport Bot) [RHEL-141684]
+- redhat/configs: Enable CONFIG_PM_DEVFREQ for aarch64 (Nick Cao) [RHEL-140756]
+- mlxbf_gige: emit messages during open and probe failures (David Thompson) [RHEL-104014]
+- mlxbf_gige: return EPROBE_DEFER if PHY IRQ is not available (David Thompson) [RHEL-104014]
+- redhat/configs: enable ACPI_DEBUG on non-debug kernels (Mark Langsdorf) [RHEL-88729 RHEL-89376]
+Resolves: RHEL-104014, RHEL-111004, RHEL-126507, RHEL-133487, RHEL-137852, RHEL-140756, RHEL-141683, RHEL-141684, RHEL-142435, RHEL-88729, RHEL-89376
+
 * Tue Feb 10 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-203.el10]
 - nouveau/gsp: fix suspend/resume regression on r570 firmware (José Expósito) [RHEL-141658]
 - nouveau: add a third state to the fini handler. (José Expósito) [RHEL-141658]
diff --git a/kernel.spec b/kernel.spec
index 61035cab0..a5d1a7257 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -176,15 +176,15 @@ Summary: The Linux kernel
 %define specrpmversion 6.12.0
 %define specversion 6.12.0
 %define patchversion 6.12
-%define pkgrelease 203
+%define pkgrelease 204
 %define kversion 6
-%define tarfile_release 6.12.0-203.el10
+%define tarfile_release 6.12.0-204.el10
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 203%{?buildid}%{?dist}
+%define specrelease 204%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.12.0-203.el10
+%define kabiversion 6.12.0-204.el10
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -4481,6 +4481,38 @@ fi\
 #
 #
 %changelog
+* Wed Feb 11 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-204.el10]
+- netlink: avoid infinite retry looping in netlink_unicast() (Paolo Abeni) [RHEL-133487] {CVE-2025-38727}
+- netlink: make sure we allow at least one dump skb (Paolo Abeni) [RHEL-133487]
+- netlink: Fix rmem check in netlink_broadcast_deliver(). (Paolo Abeni) [RHEL-133487]
+- netlink: Fix wraparounds of sk->sk_rmem_alloc. (Paolo Abeni) [RHEL-133487]
+- genetlink: fix genl_bind() invoking bind() after -EPERM (Paolo Abeni) [RHEL-133487] {CVE-2025-39926}
+- nvme: add support for dynamic quirk configuration via module parameter (Maurizio Lombardi) [RHEL-126507]
+- nvme: expose active quirks in sysfs (Maurizio Lombardi) [RHEL-141683]
+- block: fix memory leak in __blkdev_issue_zero_pages (Ming Lei) [RHEL-137852]
+- virtio: clean up features qword/dword terms (Laurent Vivier) [RHEL-111004]
+- virtio-net: avoid unnecessary checksum calculation on guest RX (Laurent Vivier) [RHEL-111004]
+- virtio_net: fix alignment for virtio_net_hdr_v1_hash (Laurent Vivier) [RHEL-111004]
+- virtio-net: zero unused hash fields (Laurent Vivier) [RHEL-111004]
+- vhost/net: enable gso over UDP tunnel support. (Laurent Vivier) [RHEL-111004]
+- tun: enable gso over UDP tunnel support. (Laurent Vivier) [RHEL-111004]
+- virtio_net: enable gso over UDP tunnel support. (Laurent Vivier) [RHEL-111004]
+- net: implement virtio helpers to handle UDP GSO tunneling. (Laurent Vivier) [RHEL-111004]
+- virtio_net: add supports for extended offloads (Laurent Vivier) [RHEL-111004]
+- vhost-net: allow configuring extended features (Laurent Vivier) [RHEL-111004]
+- virtio_pci_modern: allow configuring extended features (Laurent Vivier) [RHEL-111004]
+- virtio: introduce extended features (Laurent Vivier) [RHEL-111004]
+- fou: Don't allow 0 for FOU_ATTR_IPPROTO. (Xin Long) [RHEL-142435]
+- tools: ynl: Specify --no-line-number in ynl-regen.sh. (Xin Long) [RHEL-142435]
+- gue: Fix skb memleak with inner IP protocol 0. (Xin Long) [RHEL-142435]
+- netlink: specs: fou: replace underscores with dashes in names (Xin Long) [RHEL-142435]
+- redhat: enable FOU modules in kernel-modules-extra (Xin Long) [RHEL-142435]
+- xfs: set max_agbno to allow sparse alloc of last full inode chunk (CKI Backport Bot) [RHEL-141684]
+- redhat/configs: Enable CONFIG_PM_DEVFREQ for aarch64 (Nick Cao) [RHEL-140756]
+- mlxbf_gige: emit messages during open and probe failures (David Thompson) [RHEL-104014]
+- mlxbf_gige: return EPROBE_DEFER if PHY IRQ is not available (David Thompson) [RHEL-104014]
+- redhat/configs: enable ACPI_DEBUG on non-debug kernels (Mark Langsdorf) [RHEL-88729 RHEL-89376]
+
 * Tue Feb 10 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-203.el10]
 - nouveau/gsp: fix suspend/resume regression on r570 firmware (José Expósito) [RHEL-141658]
 - nouveau: add a third state to the fini handler. (José Expósito) [RHEL-141658]
diff --git a/sources b/sources
index b23532f4a..618c557a2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
 SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
-SHA512 (linux-6.12.0-203.el10.tar.xz) = eac77f5e349923efb7e93741937a4069e69d08422c3fc2ac1c681d79e0cafb7902e00f9936bd579a828dd5db27cb81f6d39e6e071576f90cd37d745c35877ec6
-SHA512 (kernel-abi-stablelists-6.12.0-203.el10.tar.xz) = 75150b07a4d08bbcf74e6755336dd74a99de1107a2da61216d7bab19eca6c29c2edba8b8b4ac3c3d73a7ba3612b52cd5362983e99f6d67ac01bf57fe5ad728fa
-SHA512 (kernel-kabi-dw-6.12.0-203.el10.tar.xz) = 1f78621022275ce338b7bf3a97a8ed9706c97a6cce36362b02f6cdddede8c79b2ec3566d9e4dcae4900794c2951daa9e9d17c7e3791338ea31e71b6ce34dbf8c
+SHA512 (linux-6.12.0-204.el10.tar.xz) = 9ec69edc923ef2604db83b95a0d10c8a32990fe65615d5abb9a4d555d16d4db521578ed40ad51f97be65b07235deaccb55752d197239b812ca110657b32fad62
+SHA512 (kernel-abi-stablelists-6.12.0-204.el10.tar.xz) = 253e391316b5776a6d5d403c66cf8819dcd28c7c059a9288695e7f4df15bf3e0dca32158443cee4848fe5cdcd4f542c0759cc444c36b5d1cddd2036bc720b04a
+SHA512 (kernel-kabi-dw-6.12.0-204.el10.tar.xz) = 9ab6844cf96d67241ab3c565e5b9099c7c33c09402a0b932859b7bb09e43d324e05a97c6feb063e441b620edc8c2ad39aad4b9d1355e7133c536904ed376f942