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 fdb94f3306ed5abb2647cc816c509f225ac8c8df..5f1928bebc60c512e392f766f450ff8c31bbe0af 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -550,6 +550,7 @@ CONFIG_ARM_AMBA=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
@@ -940,7 +941,7 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_NVME_SCSI=y
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_PMEM=m
-CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_DAX=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -1738,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
@@ -2079,7 +2079,7 @@ CONFIG_DRA752_THERMAL=y
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
@@ -3403,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
@@ -3431,6 +3432,7 @@ CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_POWERNV=m
 CONFIG_HOTPLUG_PCI_RPA=m
 CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
@@ -3710,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
@@ -4393,6 +4395,7 @@ CONFIG_KGDB_LOW_LEVEL_TRAP=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS is not set
 CONFIG_KINGSUN_DONGLE=m
+CONFIG_KMSG_IDS=y
 CONFIG_KMX61=m
 CONFIG_KPROBES=y
 CONFIG_KPROBES_ON_FTRACE=y
@@ -5524,7 +5527,7 @@ CONFIG_NET_CLS_U32=m
 CONFIG_NET_CORE=y
 CONFIG_NET_DCCPPROBE=m
 CONFIG_NET_DEVLINK=m
-# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
@@ -6138,7 +6141,6 @@ CONFIG_PCIEASPM_DEBUG=y
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 # CONFIG_PCIEASPM_POWERSAVE is not set
-CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIE_ALTERA is not set
 CONFIG_PCIE_ARMADA_8K=y
 CONFIG_PCIE_DPC=y
@@ -6280,7 +6282,6 @@ CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_BERLIN=y
 CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_CHERRYVIEW=m
 CONFIG_PINCTRL_DOVE=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
@@ -6622,10 +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
@@ -6919,6 +6924,7 @@ CONFIG_RIONET_TX_SIZE=128
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
@@ -7256,7 +7262,7 @@ CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_FLASHPOINT=y
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_HISI_SAS is not set
+CONFIG_SCSI_HISI_SAS=m
 CONFIG_SCSI_IBMVFC=m
 CONFIG_SCSI_IBMVFC_TRACE=y
 CONFIG_SCSI_IBMVSCSI=m
@@ -7339,6 +7345,8 @@ CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_STATS is not set
+CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK=y
@@ -8645,7 +8653,6 @@ CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
 CONFIG_TOUCHSCREEN_EKTF2127=m
-CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m