summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-02-04 07:53:28 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-02-04 07:53:28 +0100
commitd14f9fce0773f5a5f8abbffe34199597363f042f (patch)
tree691cea3b196e8e0f1a81251c7456448744a9d8c1 /kernel-s390x-fedora.config
parent2b1deffaae4a5cebc6cb0a185a86d26cf85211a6 (diff)
parent9558e54c0fe7840026d9e04a504cd5634767a43c (diff)
downloadkernel-d14f9fce0773f5a5f8abbffe34199597363f042f.tar.gz
kernel-d14f9fce0773f5a5f8abbffe34199597363f042f.tar.xz
kernel-d14f9fce0773f5a5f8abbffe34199597363f042f.zip
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-s390x-fedora.config')
-rw-r--r--kernel-s390x-fedora.config5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index d472178f9..ad17f09f9 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -514,7 +514,7 @@ CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_BREDR=y
-CONFIG_BT_CMTP=m
+# CONFIG_BT_CMTP is not set
# CONFIG_BT_DEBUGFS is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBFUSB=m
@@ -5252,7 +5252,8 @@ CONFIG_SYSCTL=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
+CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
# CONFIG_SYSTEMPORT is not set
CONFIG_SYSTEM_TRUSTED_KEYRING=y
CONFIG_SYSTEM_TRUSTED_KEYS=""