From dd000cd2fd91c63e5b4d660ec4f44666a1779716 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 3 Jan 2019 08:27:44 -0800 Subject: Linux v4.20-10911-g645ff1e8e704 Dropped part of the efi-lockdown patchset for IMA until conflicts get resolved. --- kernel-x86_64.config | 3 +++ 1 file changed, 3 insertions(+) (limited to 'kernel-x86_64.config') diff --git a/kernel-x86_64.config b/kernel-x86_64.config index bd097f4fb..938b3b19a 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2223,6 +2223,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 @@ -2358,6 +2359,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 @@ -5893,6 +5895,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 -- cgit