diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-14 07:29:53 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-14 07:29:53 +0100 |
| commit | 5c165c88898fa679284912e6623aa962e4fa687d (patch) | |
| tree | e24ab4a0eb62e4d7791c37c02ce22e5b97901683 /kernel-armv7hl-lpae.config | |
| parent | f03dfd0691ece5959a561d821b4e0ab9f6ee502e (diff) | |
| parent | 41eee5319f475b568536caa3e769861f6cfd0b7e (diff) | |
| download | kernel-5c165c88898fa679284912e6623aa962e4fa687d.tar.gz kernel-5c165c88898fa679284912e6623aa962e4fa687d.tar.xz kernel-5c165c88898fa679284912e6623aa962e4fa687d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc5.git1.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-armv7hl-lpae.config')
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index e3af01fce..c585c17e6 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2198,7 +2198,7 @@ CONFIG_IIO_TRIGGERED_BUFFER=m CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y -CONFIG_IMA_APPRAISE=y +# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_BLACKLIST_KEYRING is not set CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y # CONFIG_IMA_LOAD_X509 is not set |