X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.10%2Fs390x;h=233661007c5fcfcbbae9469d9b46d61a3a768099;hb=059b79bab1625ba8e2142292af0760cf27e61358;hp=7682773e64ccab82d8c8950faf669b1f02c3effa;hpb=6e8ab16d8604e5631620ffc6d4685ad989c70284;p=kernel-configs.git

diff --git a/5.10/s390x b/5.10/s390x
index 7682773..2336610 100644
--- a/5.10/s390x
+++ b/5.10/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.10.197-gnu1 Kernel Configuration
+# Linux/s390 5.10.212-gnu1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="s390x-linux-gcc (GCC) 12.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1255,7 +1255,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 +1268,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
@@ -2841,7 +2839,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
@@ -4017,6 +4014,8 @@ CONFIG_IMA_APPRAISE=y
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_IMA_APPRAISE_MODSIG=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
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set