X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.10%2Fs390x;h=4e1fb8d1ff28aba4e216f5ba7b737bfbcc6950a2;hb=70c528f46d165681b5b359d6ae90ca1081f8d8dd;hp=46613f6b6ae91cd01e751bed61188c9a976f518f;hpb=118bf03ebfe34e42c030b9f8176b867cd64b521c;p=kernel-configs.git

diff --git a/5.10/s390x b/5.10/s390x
index 46613f6..4e1fb8d 100644
--- a/5.10/s390x
+++ b/5.10/s390x
@@ -1,14 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.10.191-gnu1 Kernel Configuration
+# Linux/s390 5.10.220-gnu1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="s390x-linux-gcc (GCC) 12.3.0"
+CONFIG_CC_VERSION_TEXT="s390x-linux-gcc (GCC) 13.3.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120300
-CONFIG_LD_VERSION=240000000
+CONFIG_GCC_VERSION=130300
+CONFIG_LD_VERSION=242000000
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24000
+CONFIG_AS_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -390,6 +390,8 @@ CONFIG_S390_GUEST=y
 CONFIG_S390_UNWIND_SELFTEST=m
 # end of Selftests
 
+CONFIG_CPU_MITIGATIONS=y
+
 #
 # General architecture-dependent options
 #
@@ -1255,7 +1257,6 @@ CONFIG_NET_SCHED=y
 #
 # Queueing/Scheduling
 #
-CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_PRIO=m
@@ -1269,7 +1270,6 @@ CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
@@ -1298,8 +1298,6 @@ CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -1577,6 +1575,7 @@ CONFIG_DMA_SHARED_BUFFER=y
 #
 CONFIG_MHI_BUS=m
 # CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
 # end of Bus devices
 
 CONFIG_CONNECTOR=y
@@ -2842,7 +2841,6 @@ CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SKY81452=m
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
 CONFIG_MFD_LP3943=m
 CONFIG_MFD_TI_LMU=m
 CONFIG_TPS6105X=m
@@ -3831,8 +3829,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
@@ -3846,6 +3843,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
@@ -4017,7 +4015,6 @@ CONFIG_IMA_APPRAISE=y
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_IMA_APPRAISE_MODSIG=y
-CONFIG_IMA_TRUSTED_KEYRING=y
 # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
 # CONFIG_IMA_BLACKLIST_KEYRING is not set
 # CONFIG_IMA_LOAD_X509 is not set