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 dfa66bf163e47dffcdbead8fbb5ff3298161e1f9..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
@@ -953,7 +954,7 @@ CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
-CONFIG_BLK_WBT_SQ=y
+# CONFIG_BLK_WBT_SQ is not set
 CONFIG_BLOCK=y
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BL_SWITCHER=y
@@ -1198,7 +1199,9 @@ CONFIG_CCWGROUP=m
 CONFIG_CCW_CONSOLE=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 # CONFIG_CELL_CPU is not set
@@ -1736,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
@@ -1957,12 +1959,12 @@ CONFIG_DECOMPRESS_LZ4=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_CUBIC=y
-CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_IO_DELAY_TYPE=1
 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
@@ -2077,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
@@ -3401,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
@@ -3429,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
@@ -3533,6 +3537,7 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_BRCMSTB=m
 # CONFIG_I2C_CADENCE is not set
 CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CPM=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
@@ -3707,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
@@ -4607,7 +4612,6 @@ CONFIG_LOOPBACK_TARGET=m
 CONFIG_LOWMEM_CAM_NUM=3
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LP8788_ADC=m
-CONFIG_LPC_SCH=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_LRU_CACHE=m
 CONFIG_LSI_ET1011C_PHY=m
@@ -4867,7 +4871,6 @@ CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=y
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
@@ -4877,6 +4880,7 @@ CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9055=y
 CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=y
 CONFIG_MFD_DA9150=m
 CONFIG_MFD_DLN2=m
 CONFIG_MFD_EXYNOS_LPASS=m
@@ -4890,8 +4894,10 @@ CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_MFD_LM3533=m
 CONFIG_MFD_LP3943=m
 CONFIG_MFD_LP8788=y
+CONFIG_MFD_MAX14577=y
 CONFIG_MFD_MAX77620=y
 CONFIG_MFD_MAX77686=y
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MAX77843=y
 CONFIG_MFD_MAX8907=m
 CONFIG_MFD_MAX8925=y
@@ -4932,6 +4938,8 @@ CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TPS65912_SPI=y
 CONFIG_MFD_TPS80031=y
 CONFIG_MFD_TWL4030_AUDIO=y
@@ -5519,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
@@ -5899,7 +5907,6 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVEC_PAZ00=m
 CONFIG_NVEC_POWER=m
 CONFIG_NVM=y
-CONFIG_NVMEM=m
 CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_NVMEM_VF610_OCOTP is not set
@@ -6134,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
@@ -6276,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
@@ -6618,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
@@ -6774,11 +6783,11 @@ CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_AC97=m
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_SPMI=m
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_88PM8607=m
 CONFIG_REGULATOR_AAT2870=m
@@ -6915,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
@@ -7252,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
@@ -7629,6 +7639,7 @@ CONFIG_SERIO_APBPS2=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_I8042=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_NVEC_PS2=m
 CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
@@ -7636,7 +7647,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_XILINX_XPS_PS2=m
-CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_MCDI_MON=y
@@ -8643,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