UBUNTU: [Config] Disable experimental IMA options

[mirror_ubuntu-zesty-kernel.git] / debian.master / config / config.common.ubuntu

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8c541f0ef647d492bc9a355cfdebc6976ec25be2..5f1928bebc60c512e392f766f450ff8c31bbe0af 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1739,8 +1739,7 @@ CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_TALITOS=m
 CONFIG_CRYPTO_DEV_TALITOS2=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
+# CONFIG_CRYPTO_DEV_VMX is not set
 CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -3404,6 +3403,7 @@ CONFIG_HISAX_TELEINT=y
 CONFIG_HISAX_TELESPCI=y
 CONFIG_HISAX_TELES_CS=m
 CONFIG_HISAX_W6692=y
+CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
 CONFIG_HISI_FEMAC=m
 CONFIG_HISI_KIRIN_DW_DSI=m
@@ -3712,18 +3712,18 @@ CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_TRIGGERED_EVENT=m
 # CONFIG_IKCONFIG is not set
 CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_APPRAISE_SIGNED_INIT=y
-CONFIG_IMA_BLACKLIST_KEYRING=y
+# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
 # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
 # CONFIG_IMA_DEFAULT_HASH_WP512 is not set
 CONFIG_IMA_KEXEC=y
-CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
+# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
 CONFIG_IMA_LSM_RULES=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
-CONFIG_IMA_READ_POLICY=y
+# CONFIG_IMA_READ_POLICY is not set
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-CONFIG_IMA_WRITE_POLICY=y
+# CONFIG_IMA_WRITE_POLICY is not set
 CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der"
 CONFIG_IMG_ASCII_LCD=m
 CONFIG_IMX2_WDT=m
@@ -6623,11 +6623,14 @@ CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
 CONFIG_QCOM_EBI2=y
 CONFIG_QCOM_EMAC=m
+CONFIG_QCOM_FALKOR_ERRATUM_1003=y
+CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_GDSC=y
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_HIDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_IRQ_COMBINER=y
+CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PM=y
 # CONFIG_QCOM_Q6V5_PIL is not set