X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.15%2Fppc64;h=4b33991123b21000d34b7d74d6597801512ba56f;hb=refs%2Fheads%2Fmaster;hp=d2dc56a1ebf85acb19203d70e4c7a9655c7dcfb4;hpb=c74e6ad410e38ecbb038e5627b227da55339b762;p=kernel-configs.git

diff --git a/5.15/ppc64 b/5.15/ppc64
index d2dc56a..4b33991 100644
--- a/5.15/ppc64
+++ b/5.15/ppc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.153-gnu Kernel Configuration
+# Linux/powerpc 5.15.160-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64-linux-gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -569,6 +569,7 @@ CONFIG_KVM_BOOK3S_64_PR=m
 # CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
 CONFIG_KVM_XICS=y
 CONFIG_KVM_XIVE=y
+CONFIG_CPU_MITIGATIONS=y
 
 #
 # General architecture-dependent options
@@ -673,6 +674,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
@@ -1109,6 +1111,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
 
@@ -9635,8 +9638,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