X-Git-Url: https://jxself.org/git/?p=kernel-configs.git;a=blobdiff_plain;f=5.15%2Fx86-64;fp=5.15%2Fx86-64;h=a8d6b15cc33a07b94a9e96d50ce24ba22c4ac52b;hp=e5e87cb28209f658eb834d9497e9a0542e33aa40;hb=95520e1a821f0e9d5fc4cf98c4816ed433f32f64;hpb=c74e6ad410e38ecbb038e5627b227da55339b762

diff --git a/5.15/x86-64 b/5.15/x86-64
index e5e87cb..a8d6b15 100644
--- a/5.15/x86-64
+++ b/5.15/x86-64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.153-gnu Kernel Configuration
+# Linux/x86_64 5.15.155-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="x86_64-linux-gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -523,6 +523,10 @@ CONFIG_CPU_IBRS_ENTRY=y
 CONFIG_CPU_SRSO=y
 CONFIG_SLS=y
 # CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_MITIGATION_RFDS=y
+CONFIG_SPECTRE_BHI_ON=y
+# CONFIG_SPECTRE_BHI_OFF is not set
+# CONFIG_SPECTRE_BHI_AUTO is not set
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -867,6 +871,9 @@ 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_4B=y
+CONFIG_FUNCTION_ALIGNMENT_16B=y
+CONFIG_FUNCTION_ALIGNMENT=16
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -10256,8 +10263,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