UBUNTU: [Config] CONFIG_CRYPTO_DEV_VMX=y

[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 675b0c0108b6242d2eb16a356e7cffab00c3f4a7..b3cdb747b988712df57505a817e3f0a16ca537f9 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
@@ -2079,7 +2080,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 +3404,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 +3433,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 +3713,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
@@ -6139,7 +6142,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
@@ -6622,10 +6624,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 +6925,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 +7263,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