X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.15%2Fm68k;h=c13c4d0873a6e9d9a8a141327052b77dab5365af;hb=9f9a94600c5eac3d9e975df05745c45162cadc76;hp=ffcd451283d8003d6e2a2d86f45dc2da2106ed2a;hpb=c74e6ad410e38ecbb038e5627b227da55339b762;p=kernel-configs.git

diff --git a/5.15/m68k b/5.15/m68k
index ffcd451..c13c4d0 100644
--- a/5.15/m68k
+++ b/5.15/m68k
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/m68k 5.15.153-gnu Kernel Configuration
+# Linux/m68k 5.15.160-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="m68k-linux-gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -281,6 +281,8 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y
 CONFIG_SERIAL_CONSOLE=y
 # end of Character devices
 
+CONFIG_CPU_MITIGATIONS=y
+
 #
 # General architecture-dependent options
 #
@@ -309,6 +311,8 @@ CONFIG_HAVE_ARCH_PFN_VALID=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
@@ -665,6 +669,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
 
 #
@@ -2646,8 +2651,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