X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.15%2Fs390x;h=169c6ef9e5bf95a5bb0665b097967c9fea19e10d;hb=6b2afa3eece40899620a1ace4fa135c93bb3754b;hp=c1e42d5da01c8927ff7388660c8b9043bf3ddbbb;hpb=af1b4e88fe23dd4714eea8b26ccce5bab98d759a;p=kernel-configs.git

diff --git a/5.15/s390x b/5.15/s390x
index c1e42d5..169c6ef 100644
--- a/5.15/s390x
+++ b/5.15/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.15.120-gnu Kernel Configuration
+# Linux/s390 5.15.136-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="s390x-linux-gcc (GCC) 12.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1335,8 +1335,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
@@ -3387,7 +3385,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