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

diff --git a/5.15/s390x b/5.15/s390x
index 34a8457..ab68771 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.155-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="s390x-linux-gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -491,6 +491,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
@@ -3190,8 +3191,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