X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.4%2Fs390x;h=ed4db2fb7021df8c31d3be1c5a519b80204e56dc;hb=6e8ab16d8604e5631620ffc6d4685ad989c70284;hp=9d698276db5fd12a1e82c962c6efb108f596cc54;hpb=715db5c9a62e829ebfa7955deab0a763abff4cf8;p=kernel-configs.git

diff --git a/5.4/s390x b/5.4/s390x
index 9d69827..ed4db2f 100644
--- a/5.4/s390x
+++ b/5.4/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.252-gnu1 Kernel Configuration
+# Linux/s390 5.4.257-gnu1 Kernel Configuration
 #
 
 #
@@ -1265,8 +1265,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
@@ -3197,10 +3195,7 @@ 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
 CONFIG_EVM=y
 CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_EXTRA_SMACK_XATTRS=y