X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.15%2Fs390x;h=eed16f14c049eb3e3d58c2115d463ac3d0422d6c;hb=70c528f46d165681b5b359d6ae90ca1081f8d8dd;hp=ab6877115901518fde2f1e834569bc8cbb31b7b4;hpb=95520e1a821f0e9d5fc4cf98c4816ed433f32f64;p=kernel-configs.git

diff --git a/5.15/s390x b/5.15/s390x
index ab68771..eed16f1 100644
--- a/5.15/s390x
+++ b/5.15/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.15.155-gnu Kernel Configuration
+# Linux/s390 5.15.160-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="s390x-linux-gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -397,6 +397,8 @@ CONFIG_S390_GUEST=y
 # CONFIG_S390_UNWIND_SELFTEST is not set
 # end of Selftests
 
+CONFIG_CPU_MITIGATIONS=y
+
 #
 # General architecture-dependent options
 #
@@ -963,6 +965,7 @@ CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NFT_REJECT_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XTABLES_COMPAT=y