diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-04 07:53:28 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-04 07:53:28 +0100 |
| commit | d14f9fce0773f5a5f8abbffe34199597363f042f (patch) | |
| tree | 691cea3b196e8e0f1a81251c7456448744a9d8c1 /configs/fedora/generic | |
| parent | 2b1deffaae4a5cebc6cb0a185a86d26cf85211a6 (diff) | |
| parent | 9558e54c0fe7840026d9e04a504cd5634767a43c (diff) | |
| download | kernel-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 'configs/fedora/generic')
| -rw-r--r-- | configs/fedora/generic/CONFIG_BT_CMTP | 2 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE | 2 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/configs/fedora/generic/CONFIG_BT_CMTP b/configs/fedora/generic/CONFIG_BT_CMTP index 6fe276815..fefe1adcd 100644 --- a/configs/fedora/generic/CONFIG_BT_CMTP +++ b/configs/fedora/generic/CONFIG_BT_CMTP @@ -1 +1 @@ -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set diff --git a/configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE b/configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE index fea571fdc..a831f7ab1 100644 --- a/configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE +++ b/configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE @@ -1 +1 @@ -# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +CONFIG_SYSTEM_EXTRA_CERTIFICATE=y diff --git a/configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE b/configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE new file mode 100644 index 000000000..330619e5c --- /dev/null +++ b/configs/fedora/generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE @@ -0,0 +1 @@ +CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096 |