X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.15%2Fs390x;h=069f067cededd83eecfdebf4e7d03ca4f8aa986e;hb=refs%2Fheads%2Fmaster;hp=34a845759f8b97ee54cbb4eb948c4afc364df999;hpb=c74e6ad410e38ecbb038e5627b227da55339b762;p=kernel-configs.git

diff --git a/5.15/s390x b/5.15/s390x
index 34a8457..eed16f1 100644
--- a/5.15/s390x
+++ b/5.15/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.15.153-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
 #
@@ -491,6 +493,7 @@ CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+CONFIG_FUNCTION_ALIGNMENT=0
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -962,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
 
@@ -3190,8 +3194,7 @@ CONFIG_NFS_DEBUG=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 # CONFIG_NFS_V4_2_READ_PLUS is not set
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V2 is not set
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_PNFS=y