diff options
author | Laura Abbott <labbott@redhat.com> | 2019-01-03 08:27:44 -0800 |
---|---|---|
committer | Laura Abbott <labbott@redhat.com> | 2019-01-03 08:28:18 -0800 |
commit | dd000cd2fd91c63e5b4d660ec4f44666a1779716 (patch) | |
tree | 7650c96b98efc9051cd2e688d9a04fce03a79c15 /kernel-i686.config | |
parent | cca46e0b1d2ddbaaa6197f118a0229031cfcd69c (diff) | |
download | kernel-dd000cd2fd91c63e5b4d660ec4f44666a1779716.tar.gz kernel-dd000cd2fd91c63e5b4d660ec4f44666a1779716.tar.xz kernel-dd000cd2fd91c63e5b4d660ec4f44666a1779716.zip |
Linux v4.20-10911-g645ff1e8e704
Dropped part of the efi-lockdown patchset for IMA until
conflicts get resolved.
Diffstat (limited to 'kernel-i686.config')
-rw-r--r-- | kernel-i686.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index e0ee1951b..2ba4fcc23 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2181,6 +2181,7 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE is not set +# CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_BLACKLIST_KEYRING is not set CONFIG_IMA_DEFAULT_HASH_SHA1=y # CONFIG_IMA_DEFAULT_HASH_SHA256 is not set @@ -2313,6 +2314,7 @@ CONFIG_INT3406_THERMAL=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y +# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY=y CONFIG_INTEL_ATOMISP2_PM=m @@ -5849,6 +5851,7 @@ CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m +# CONFIG_TOUCHSCREEN_RASPBERRYPI_FW is not set CONFIG_TOUCHSCREEN_RM_TS=m # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_TOUCHSCREEN_S6SY761 is not set |