X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.4%2Fs390x;h=1b957a323fc15540bf91b8e65509bff8897c96c5;hb=f1f39a96fb2ea8bf4ed00277905a83b9b0d56a12;hp=aa1e4fcceb3229f0a7c2d85a9c0f6d4b388eafd7;hpb=c3225948c5bf597e61acc4efa62b01d2100d7080;p=kernel-configs.git

diff --git a/5.4/s390x b/5.4/s390x
index aa1e4fc..1b957a3 100644
--- a/5.4/s390x
+++ b/5.4/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.245-gnu1 Kernel Configuration
+# Linux/s390 5.4.258-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
@@ -1692,6 +1689,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_SCSI_ESAS2R is not set
@@ -3197,7 +3195,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