X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.15%2Fsparc64;h=e997b3e82b1238f8de36a73d5308120e6c00efbe;hb=refs%2Fheads%2Fmaster;hp=79be4f78ee12087952d9cde49045d2f2c54472a6;hpb=c74e6ad410e38ecbb038e5627b227da55339b762;p=kernel-configs.git

diff --git a/5.15/sparc64 b/5.15/sparc64
index 79be4f7..e997b3e 100644
--- a/5.15/sparc64
+++ b/5.15/sparc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/sparc 5.15.153-gnu Kernel Configuration
+# Linux/sparc 5.15.160-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="sparc64-linux-gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -352,6 +352,8 @@ CONFIG_DISPLAY7SEG=m
 CONFIG_ORACLE_DAX=m
 # end of Misc Linux/SPARC drivers
 
+CONFIG_CPU_MITIGATIONS=y
+
 #
 # General architecture-dependent options
 #
@@ -402,6 +404,8 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 #
 # CONFIG_GCOV_KERNEL is not set
 # end of GCOV-based kernel profiling
+
+CONFIG_FUNCTION_ALIGNMENT=0
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -799,6 +803,7 @@ CONFIG_NFT_FIB_NETDEV=m
 # CONFIG_NFT_REJECT_NETDEV is not set
 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
 
@@ -6628,8 +6633,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