X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.4%2Fs390x;h=ed4db2fb7021df8c31d3be1c5a519b80204e56dc;hb=6e8ab16d8604e5631620ffc6d4685ad989c70284;hp=0164d5aa96895cb53caaa77b34f0f22f59dd6bb4;hpb=129c554b2a82f5e2a47857c42cdf13499f5a0da8;p=kernel-configs.git

diff --git a/5.4/s390x b/5.4/s390x
index 0164d5a..ed4db2f 100644
--- a/5.4/s390x
+++ b/5.4/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.246-gnu1 Kernel Configuration
+# Linux/s390 5.4.257-gnu1 Kernel Configuration
 #
 
 #
@@ -1211,7 +1211,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
@@ -1266,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
@@ -3198,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