kernel: Update to 4.6.7

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 40a5c6ee21fcae6b35e855fa39109485fbd6fb6b..bbff1929c5b94df19f7683fbde75cd60148ad49a 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -15,6 +15,7 @@ CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_RCU_NOCB_CPU_NONE=y
 # CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
+# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
 CONFIG_PERF_USE_VMALLOC=y
 
 #
@@ -26,6 +27,9 @@ CONFIG_CLONE_BACKWARDS=y
 #
 # Platform selection
 #
+# CONFIG_ARCH_ALPINE is not set
+CONFIG_ARCH_MESON=y
+# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_UNIPHIER is not set
 CONFIG_ARCH_VEXPRESS=y
@@ -35,6 +39,10 @@ CONFIG_ARCH_VEXPRESS=y
 #
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_IOV is not set
@@ -44,12 +52,8 @@ CONFIG_PCI_SYSCALL=y
 #
 # PCI host controller drivers
 #
-CONFIG_PCIE_DW=y
+CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
 
 #
 # ARM errata workarounds via the alternatives framework
@@ -124,7 +128,7 @@ CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI_PMU=y
 CONFIG_ARM_CCI400_COMMON=y
 CONFIG_ARM_CCI400_PMU=y
-CONFIG_ARM_CCI500_PMU=y
+CONFIG_ARM_CCI5xx_PMU=y
 # CONFIG_ARM_CCN is not set
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_DTC=y
@@ -243,7 +247,6 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
 # Serial drivers
 #
 CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_INGENIC=y
 CONFIG_SERIAL_OF_PLATFORM=y
 
 #
@@ -252,6 +255,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_AMBA_PL010=m
 CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
+CONFIG_SERIAL_MESON=m
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
@@ -275,6 +279,7 @@ CONFIG_I2C_SIS630=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_MESON=m
 CONFIG_I2C_VERSATILE=m
 
 #
@@ -321,6 +326,7 @@ CONFIG_SENSORS_VEXPRESS=m
 # Watchdog Device Drivers
 #
 CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
 
 #
 # PCI-based Watchdog Cards
@@ -350,6 +356,11 @@ CONFIG_REGULATOR_VEXPRESS=m
 #
 # CONFIG_TTPCI_EEPROM is not set
 
+#
+# Media drivers
+#
+# CONFIG_IR_MESON is not set
+
 #
 # Digital TV USB devices
 #
@@ -401,10 +412,19 @@ CONFIG_DVB_STV0297=y
 #
 CONFIG_DVB_LNBP21=y
 
+#
+# Graphics support
+#
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+
 #
 # I2C encoder or helper chips
 #
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
+CONFIG_DRM_ARM=y
+CONFIG_DRM_HDLCD=m
+# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 
 #
 # Frame buffer hardware drivers
@@ -449,6 +469,7 @@ CONFIG_SND_SOC_IMX_AUDMUX=m
 # Allwinner SoC Audio support
 #
 CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -478,10 +499,14 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
 CONFIG_SND_SOC_PCM3168A=m
 CONFIG_SND_SOC_PCM3168A_I2C=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT5616=m
 CONFIG_SND_SOC_RT5631=m
 # CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_SGTL5000=m
@@ -597,6 +622,9 @@ CONFIG_ARM_MHU=m
 CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
+CONFIG_IOMMU_DMA=y
 
 #
 # Extcon Device Drivers

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 207c6af862542abe43f0be81eedbd1fc95711126..d84721ff98d4000096a6241dc6b8453da069e6dd 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -74,8 +74,7 @@ CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_ARCH_MULTI_CPU_AUTO is not set
 CONFIG_ARCH_VIRT=y
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
 CONFIG_ARCH_BCM=y
 
@@ -115,7 +114,6 @@ CONFIG_ARCH_HI3xxx=y
 CONFIG_ARCH_HIP04=y
 CONFIG_ARCH_HIX5HD2=y
 CONFIG_ARCH_KEYSTONE=y
-CONFIG_ARCH_MESON=y
 CONFIG_MACH_MESON6=y
 CONFIG_MACH_MESON8=y
 CONFIG_MACH_MESON8B=y
@@ -144,6 +142,7 @@ CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
 CONFIG_ARCH_MEDIATEK=y
 CONFIG_MACH_MT6589=y
 CONFIG_MACH_MT6592=y
+CONFIG_MACH_MT7623=y
 CONFIG_MACH_MT8127=y
 CONFIG_MACH_MT8135=y
 CONFIG_ARCH_OMAP=y
@@ -322,7 +321,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_HEAVY_MB=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
-CONFIG_ARM_KERNMEM_PERMS=y
+CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_MULTI_IRQ_HANDLER=y
 # CONFIG_ARM_ERRATA_430973 is not set
 CONFIG_ARM_ERRATA_643719=y
@@ -444,9 +443,6 @@ CONFIG_NEON=y
 #
 # CONFIG_HIBERNATION is not set
 CONFIG_APM_EMULATION=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 
@@ -470,6 +466,7 @@ CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_OMAP_INTERCONNECT=y
 # CONFIG_OMAP_OCP2SCP is not set
 CONFIG_SUNXI_RSB=m
+CONFIG_OF_DYNAMIC=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_MG_DISK is not set
 
@@ -480,7 +477,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_ARM_CHARLCD is not set
 
 #
-# Intel MIC Coprocessor State Management (COSM) Drivers
+# VOP Driver
 #
 # CONFIG_IDE is not set
 
@@ -531,6 +528,8 @@ CONFIG_FSL_PQ_MDIO=m
 CONFIG_FSL_XGMAC_MDIO=m
 CONFIG_GIANFAR=m
 CONFIG_PXA168_ETH=m
+CONFIG_NET_VENDOR_MEDIATEK=y
+CONFIG_NET_MEDIATEK_SOC=m
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_SMC911X=m
@@ -591,7 +590,6 @@ CONFIG_SERIAL_8250_MT6577=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_MESON=m
 CONFIG_SERIAL_SAMSUNG=m
 CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
@@ -617,6 +615,7 @@ CONFIG_NVRAM=y
 # Multiplexer I2C Chip support
 #
 CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_DEMUX_PINCTRL=m
 
 #
 # PC SMBus host controller drivers
@@ -632,7 +631,6 @@ CONFIG_I2C_BCM_IPROC=m
 CONFIG_I2C_DAVINCI=m
 CONFIG_I2C_EXYNOS5=m
 CONFIG_I2C_IMX=m
-CONFIG_I2C_MESON=m
 CONFIG_I2C_MT65XX=m
 CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_NOMADIK=y
@@ -686,12 +684,6 @@ CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SIRF=y
 CONFIG_PINCTRL_ST=y
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA20=y
-CONFIG_PINCTRL_TEGRA30=y
-CONFIG_PINCTRL_TEGRA114=y
-CONFIG_PINCTRL_TEGRA124=y
-CONFIG_PINCTRL_TEGRA_XUSB=y
 # CONFIG_PINCTRL_PALMAS is not set
 CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINCTRL_IPROC_GPIO=y
@@ -716,6 +708,7 @@ CONFIG_PINCTRL_DB8540=y
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_APQ8064=y
 CONFIG_PINCTRL_APQ8084=y
+CONFIG_PINCTRL_IPQ4019=y
 CONFIG_PINCTRL_IPQ8064=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8960=m
@@ -727,7 +720,7 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
-CONFIG_PINCTRL_SUNXI_COMMON=y
+CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUN4I_A10=y
 CONFIG_PINCTRL_SUN5I_A10S=y
 CONFIG_PINCTRL_SUN5I_A13=y
@@ -740,10 +733,19 @@ CONFIG_PINCTRL_SUN8I_A33=y
 CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_A23_R=y
 CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN9I_A80=y
 CONFIG_PINCTRL_SUN9I_A80_R=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA20=y
+CONFIG_PINCTRL_TEGRA30=y
+CONFIG_PINCTRL_TEGRA114=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
 # CONFIG_PINCTRL_WM8850 is not set
-CONFIG_PINCTRL_MTK_COMMON=y
+CONFIG_PINCTRL_MTK=y
+# CONFIG_PINCTRL_MT2701 is not set
+CONFIG_PINCTRL_MT7623=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
@@ -756,6 +758,7 @@ CONFIG_GPIO_BRCMSTB=m
 # CONFIG_GPIO_DAVINCI is not set
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
 CONFIG_GPIO_VF610=y
@@ -785,6 +788,7 @@ CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DB8500_THERMAL=y
 CONFIG_TEGRA_SOCTHERM=m
 CONFIG_DB8500_CPUFREQ_COOLING=y
+CONFIG_MTK_THERMAL=m
 
 #
 # Texas Instruments thermal drivers
@@ -816,10 +820,10 @@ CONFIG_SIRFSOC_WATCHDOG=y
 CONFIG_ST_LPC_WATCHDOG=m
 CONFIG_TEGRA_WATCHDOG=m
 CONFIG_QCOM_WDT=m
-CONFIG_MESON_WATCHDOG=m
 CONFIG_MEDIATEK_WATCHDOG=m
 CONFIG_ATLAS7_WATCHDOG=m
 CONFIG_BCM47XX_WDT=m
+CONFIG_BCM7038_WDT=m
 
 #
 # Sonics Silicon Backplane
@@ -830,6 +834,7 @@ CONFIG_SSB_HOST_SOC=y
 # Multifunction device drivers
 #
 CONFIG_MFD_ATMEL_HLCDC=m
+CONFIG_MFD_AXP20X_RSB=m
 # CONFIG_MFD_CROS_EC is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
@@ -867,7 +872,6 @@ CONFIG_REGULATOR_TWL4030=y
 #
 # Media drivers
 #
-# CONFIG_IR_MESON is not set
 # CONFIG_RC_ST is not set
 CONFIG_IR_SUNXI=m
 
@@ -876,10 +880,10 @@ CONFIG_IR_SUNXI=m
 #
 CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
-CONFIG_VIDEO_MX3=m
 # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
 # CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
 # CONFIG_VIDEO_AM437X_VPFE is not set
+# CONFIG_VIDEO_TI_CAL is not set
 # CONFIG_VIDEO_CODA is not set
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
@@ -900,11 +904,9 @@ CONFIG_DVB_STV0367=m
 CONFIG_TEGRA_HOST1X=y
 CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
 
 #
-# I2C encoder or helper chips
+# ACP (Audio CoProcessor) Configuration
 #
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_DRM_EXYNOS=m
@@ -928,7 +930,6 @@ CONFIG_DRM_EXYNOS_MIC=y
 #
 # Sub-drivers
 #
-CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_IPP=y
 # CONFIG_DRM_EXYNOS_FIMC is not set
 # CONFIG_DRM_EXYNOS_ROTATOR is not set
@@ -936,6 +937,7 @@ CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_INNO_HDMI=m
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_OMAP=m
@@ -1015,10 +1017,6 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 # CONFIG_SND_SOC_ADI is not set
-CONFIG_SND_EDMA_SOC=m
-CONFIG_SND_DAVINCI_SOC_MCASP=m
-CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
-CONFIG_SND_AM33XX_SOC_EVM=m
 
 #
 # Common SoC Audio options for Freescale CPUs:
@@ -1039,6 +1037,8 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_MEDIATEK=m
 CONFIG_SND_SOC_MT8173_MAX98090=m
+CONFIG_SND_SOC_MT8173_RT5650=m
+CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
@@ -1083,7 +1083,7 @@ CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX98357A=m
-CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_WM8994=m
@@ -1208,13 +1208,13 @@ CONFIG_DMA_SUN6I=m
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_NBPFAXI_DMA=m
-# CONFIG_QCOM_BAM_DMA is not set
 # CONFIG_SIRF_DMA is not set
 # CONFIG_STE_DMA40 is not set
 # CONFIG_TEGRA20_APB_DMA is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_TI_EDMA is not set
 CONFIG_XILINX_VDMA=m
+# CONFIG_QCOM_BAM_DMA is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -1234,6 +1234,7 @@ CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
+CONFIG_IPQ_GCC_4019=m
 CONFIG_IPQ_GCC_806X=m
 CONFIG_IPQ_LCC_806X=m
 CONFIG_MSM_GCC_8660=m
@@ -1247,6 +1248,7 @@ CONFIG_MSM_GCC_8996=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_TEGRA_CLK_EMC=y
+CONFIG_COMMON_CLK_TI_ADPLL=m
 CONFIG_HWSPINLOCK=m
 
 #
@@ -1284,7 +1286,10 @@ CONFIG_CLKSRC_ST_LPC=y
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_ROCKCHIP_MBOX=y
 CONFIG_STI_MBOX=m
+CONFIG_TI_MESSAGE_MANAGER=m
+CONFIG_HI6220_MBOX=m
 
 #
 # Generic IOMMU Pagetable Support
@@ -1296,6 +1301,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_TEGRA_IOMMU_SMMU is not set
 # CONFIG_EXYNOS_IOMMU is not set
 CONFIG_ARM_SMMU=y
+CONFIG_MTK_IOMMU=y
 
 #
 # Remoteproc drivers
@@ -1303,6 +1309,7 @@ CONFIG_ARM_SMMU=y
 CONFIG_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_WKUP_M3_RPROC=m
+CONFIG_ST_REMOTEPROC=m
 
 #
 # Rpmsg drivers
@@ -1325,6 +1332,8 @@ CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMSM is not set
 # CONFIG_QCOM_WCNSS_CTRL is not set
 CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SOC_SAMSUNG=y
+CONFIG_EXYNOS_PMU=y
 CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
@@ -1349,6 +1358,7 @@ CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_TEGRA20_MC=y
+CONFIG_MTK_SMI=y
 CONFIG_TEGRA_MC=y
 CONFIG_TEGRA124_EMC=y
 
@@ -1418,6 +1428,8 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_STIH407_USB=m
 CONFIG_PHY_STIH41X_USB=m
 CONFIG_PHY_QCOM_UFS=m
@@ -1427,6 +1439,7 @@ CONFIG_PHY_BRCMSTB_SATA=m
 # Android
 #
 CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_MTK_EFUSE=m
 CONFIG_QCOM_QFPROM=m
 CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_NVMEM_SUNXI_SID=m
@@ -1467,6 +1480,11 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ENGINE=m
+
 #
 # Random Number Generation
 #

diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index c2dfc50da952e7fcfa3b766630bfbe373f030bac..d133512601ed93be8d4a0872791af4b184813dac 100644 (file)
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -45,9 +45,10 @@ CONFIG_PREEMPT_NOTIFIERS=y
 #
 # Platform selection
 #
+# CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_EXYNOS7 is not set
+# CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_MEDIATEK is not set
@@ -58,6 +59,7 @@ CONFIG_ARCH_SEATTLE=y
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_SPRD is not set
 # CONFIG_ARCH_THUNDER is not set
+# CONFIG_ARCH_VULCAN is not set
 CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_ZYNQMP is not set
 
@@ -66,18 +68,16 @@ CONFIG_ARCH_XGENE=y
 #
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_LABEL=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=y
 
 #
 # PCI host controller drivers
 #
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_HISI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=y
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
 
 #
 # ARM errata workarounds via the alternatives framework
@@ -92,6 +92,7 @@ CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
+CONFIG_CAVIUM_ERRATUM_27456=y
 # CONFIG_ARM64_4K_PAGES is not set
 # CONFIG_ARM64_16K_PAGES is not set
 CONFIG_ARM64_64K_PAGES=y
@@ -104,6 +105,7 @@ CONFIG_NR_CPUS=64
 CONFIG_HZ_300=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=300
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -129,10 +131,22 @@ CONFIG_SETEND_EMULATION=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_LSE_ATOMICS=y
+CONFIG_ARM64_VHE=y
+
+#
+# ARMv8.2 architectural features
+#
+CONFIG_ARM64_UAO=y
+CONFIG_ARM64_MODULE_CMODEL_LARGE=y
+CONFIG_ARM64_MODULE_PLTS=y
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 
 #
 # Boot options
 #
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
@@ -176,7 +190,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV_SKD=m
 
 #
-# Intel MIC Coprocessor State Management (COSM) Drivers
+# VOP Driver
 #
 # CONFIG_GENWQE is not set
 
@@ -192,6 +206,7 @@ CONFIG_SATA_ZPODD=y
 # Controllers with non-SFF native interface
 #
 CONFIG_AHCI_XGENE=m
+CONFIG_SATA_AHCI_SEATTLE=m
 
 #
 # Generic fallback / legacy drivers
@@ -214,7 +229,9 @@ CONFIG_NET_SB1000=m
 #
 # MII PHY device drivers
 #
+CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -303,6 +320,11 @@ CONFIG_POWER_RESET_XGENE=y
 #
 CONFIG_SENSORS_ACPI_POWER=m
 
+#
+# Watchdog Device Drivers
+#
+CONFIG_ARM_SBSA_WATCHDOG=m
+
 #
 # Multifunction device drivers
 #
@@ -400,12 +422,11 @@ CONFIG_COMMON_CLK_XGENE=y
 CONFIG_CLKSRC_ACPI=y
 # CONFIG_PL320_MBOX is not set
 CONFIG_PCC=y
+CONFIG_XGENE_SLIMPRO_MBOX=m
 
 #
 # Generic IOMMU Pagetable Support
 #
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_DMA=y
 # CONFIG_ARM_SMMU is not set
 CONFIG_ARM_SMMU_V3=y
 
@@ -442,6 +463,8 @@ CONFIG_BTT=y
 #
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 
 #
 # EFI (Extensible Firmware Interface) Support
@@ -493,6 +516,7 @@ CONFIG_KVM_COMPAT=y
 CONFIG_KVM_ARM_VGIC_V3=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
+CONFIG_KVM_ARM_PMU=y
 
 #
 # Compile-time checks and compiler options
@@ -508,6 +532,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 #
 # Runtime Testing
 #
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
 

diff --git a/kernel/config-generic b/kernel/config-generic
index ab4ffbce9c22e84a2db404e574cecef1fba1bdb1..a184b753577be4c5f562ecf6bf2ecd6688e506b6 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -11,6 +11,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_DEBUG_RODATA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -142,6 +143,7 @@ CONFIG_SYSFS_SYSCALL=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -281,6 +283,7 @@ CONFIG_FREEZER=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
+# CONFIG_GOLDFISH is not set
 # CONFIG_XEN is not set
 CONFIG_NO_BOOTMEM=y
 CONFIG_SWIOTLB=y
@@ -332,7 +335,10 @@ CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
 
 #
 # CPU Frequency scaling
@@ -376,6 +382,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
@@ -383,10 +390,15 @@ CONFIG_PCIEASPM=y
 CONFIG_PCIE_PME=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
 
 #
 # PCI host controller drivers
 #
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW=y
 
 #
 # PC-card bridges
@@ -452,7 +464,6 @@ CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -905,11 +916,15 @@ CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
 CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
@@ -917,7 +932,6 @@ CONFIG_BATMAN_ADV_MCAST=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 # CONFIG_OPENVSWITCH is not set
 CONFIG_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -956,6 +970,7 @@ CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
+CONFIG_BT_LEDS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BT_DEBUGFS is not set
 
@@ -978,6 +993,7 @@ CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -986,6 +1002,7 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
 # CONFIG_AF_RXRPC is not set
+# CONFIG_AF_KCM is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -996,7 +1013,6 @@ CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
@@ -1031,6 +1047,9 @@ CONFIG_RFKILL_INPUT=y
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
 CONFIG_LWTUNNEL=y
+CONFIG_DST_CACHE=y
+CONFIG_NET_DEVLINK=y
+CONFIG_MAY_USE_DEVLINK=y
 CONFIG_HAVE_BPF_JIT=y
 
 #
@@ -1153,6 +1172,10 @@ CONFIG_ALTERA_STAPL=m
 # SCIF Bus Driver
 #
 
+#
+# VOP Bus Driver
+#
+
 #
 # Intel MIC Host Driver
 #
@@ -1168,6 +1191,10 @@ CONFIG_ALTERA_STAPL=m
 #
 # Intel MIC Coprocessor State Management (COSM) Drivers
 #
+
+#
+# VOP Driver
+#
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_KERNEL_API is not set
@@ -1410,7 +1437,6 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
 CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_ERA=m
@@ -1449,6 +1475,7 @@ CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
+# CONFIG_MACSEC is not set
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
@@ -1482,7 +1509,7 @@ CONFIG_NET_DSA_MV88E6XXX=y
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
 CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6123=m
 CONFIG_NET_DSA_MV88E6171=m
 CONFIG_NET_DSA_MV88E6352=m
 CONFIG_NET_DSA_BCM_SF2=m
@@ -1533,6 +1560,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_UWIRE=y
 CONFIG_CHELSIO_T4VF=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
@@ -1576,6 +1604,7 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
+# CONFIG_MVNETA_BM is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKY2=m
@@ -1809,6 +1838,7 @@ CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_AHB=y
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
 # CONFIG_ATH10K_TRACING is not set
@@ -2051,10 +2081,6 @@ CONFIG_HISAX_ST5481=m
 CONFIG_HISAX_HFCUSB=m
 CONFIG_HISAX_HFC4S8S=m
 # CONFIG_HISAX_FRITZ_PCIPNP is not set
-
-#
-# Active cards
-#
 CONFIG_ISDN_CAPI=m
 CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -2132,6 +2158,7 @@ CONFIG_KEYBOARD_BCM=m
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
@@ -2190,6 +2217,12 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
 
 #
 # Hardware I/O ports
@@ -2248,6 +2281,7 @@ CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DW=m
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_8250_MOXA=m
 
 #
 # Non-8250 serial port support
@@ -2262,6 +2296,8 @@ CONFIG_SERIAL_SC16IS7XX_I2C=y
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_SERIAL_MVEBU_CONSOLE=y
 # CONFIG_TTY_PRINTK is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_VIRTIO_CONSOLE=m
@@ -2436,6 +2472,7 @@ CONFIG_GPIO_ADNP=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SX150X is not set
+CONFIG_GPIO_TPIC2810=m
 
 #
 # MFD GPIO expanders
@@ -2449,6 +2486,8 @@ CONFIG_GPIO_CRYSTAL_COVE=m
 # CONFIG_GPIO_PALMAS is not set
 # CONFIG_GPIO_RC5T583 is not set
 CONFIG_GPIO_STMPE=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS65218=m
 # CONFIG_GPIO_TPS6586X is not set
 # CONFIG_GPIO_TPS65910 is not set
 # CONFIG_GPIO_TPS65912 is not set
@@ -2481,6 +2520,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PDA_POWER is not set
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_TEST_POWER is not set
+CONFIG_BATTERY_ACT8945A=m
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
@@ -2562,6 +2602,7 @@ CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4222=m
@@ -2705,13 +2746,11 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_RN5T618_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
-CONFIG_TS4800_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_KEMPLD_WDT=m
-CONFIG_BCM7038_WDT=m
 CONFIG_MEN_A21_WDT=m
 
 #
@@ -2759,13 +2798,15 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+CONFIG_MFD_ACT8945A=m
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_AS3722=y
 CONFIG_PMIC_ADP5520=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_ATMEL_FLEXCOM=m
 CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
 CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_I2C=y
@@ -2825,6 +2866,7 @@ CONFIG_MFD_PALMAS=y
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
+CONFIG_MFD_TPS65086=m
 CONFIG_MFD_TPS65090=y
 # CONFIG_MFD_TPS65217 is not set
 CONFIG_MFD_TPS65218=m
@@ -2851,6 +2893,7 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_ACT8945A=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AAT2870=m
@@ -2905,6 +2948,7 @@ CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
 CONFIG_REGULATOR_TPS65090=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_TPS6586X=m
@@ -3423,9 +3467,10 @@ CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_FBDEV_EMULATION is not set
+CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
 
@@ -3443,6 +3488,11 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_CIK=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
@@ -3589,6 +3639,7 @@ CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_OSSEMUL=y
@@ -3754,6 +3805,7 @@ CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
 CONFIG_HID_CORSAIR=m
 # CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CMEDIA is not set
 CONFIG_HID_CP2112=m
 CONFIG_HID_CYPRESS=y
 # CONFIG_HID_DRAGONRISE is not set
@@ -4147,6 +4199,7 @@ CONFIG_LEDS_MAX8997=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_MENF21BMC=m
 CONFIG_LEDS_KTD2692=m
+CONFIG_LEDS_IS31FL32XX=m
 
 #
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
@@ -4200,10 +4253,10 @@ CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307_HWMON=y
 CONFIG_RTC_DRV_DS1374=m
 CONFIG_RTC_DRV_DS1374_WDT=y
 CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_LP8788=m
 CONFIG_RTC_DRV_MAX6900=m
@@ -4213,22 +4266,20 @@ CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_RK808=m
-CONFIG_RTC_DRV_MAX77802=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12057=m
 CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PALMAS=m
-CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_TWL4030=m
+CONFIG_RTC_DRV_PALMAS=m
 CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_TPS80031=m
@@ -4240,12 +4291,20 @@ CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
 
 #
 # SPI RTC drivers
 #
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_PCF2127=m
 
 #
 # Platform RTC drivers
@@ -4299,6 +4358,8 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 CONFIG_FSL_EDMA=m
 CONFIG_INTEL_IDMA64=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
 CONFIG_HSU_DMA=m
 
 #
@@ -4344,6 +4405,7 @@ CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SI5351=m
 CONFIG_COMMON_CLK_SI514=m
 CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_CDCE706=m
 CONFIG_COMMON_CLK_CDCE925=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_COMMON_CLK_S2MPS11=m
@@ -4351,7 +4413,6 @@ CONFIG_CLK_TWL6040=m
 # CONFIG_COMMON_CLK_NXP is not set
 CONFIG_COMMON_CLK_PALMAS=m
 # CONFIG_COMMON_CLK_PXA is not set
-CONFIG_COMMON_CLK_CDCE706=m
 
 #
 # Hardware Spinlock drivers
@@ -4374,6 +4435,7 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+CONFIG_IOMMU_IOVA=y
 CONFIG_OF_IOMMU=y
 
 #
@@ -4463,6 +4525,7 @@ CONFIG_PALMAS_GPADC=m
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
 # CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADS1015 is not set
 CONFIG_TWL4030_MADC=m
 CONFIG_VF610_ADC=m
 # CONFIG_VIPERBOARD_ADC is not set
@@ -4474,6 +4537,7 @@ CONFIG_VF610_ADC=m
 #
 # Chemical Sensors
 #
+# CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_VZ89X is not set
 
@@ -4499,6 +4563,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_MAX517 is not set
 CONFIG_MAX5821=m
 # CONFIG_MCP4725 is not set
+# CONFIG_VF610_DAC is not set
 
 #
 # IIO dummy driver
@@ -4526,8 +4591,13 @@ CONFIG_MAX5821=m
 # CONFIG_ITG3200 is not set
 
 #
-# Health sensors
+# Health Sensors
 #
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4404 is not set
 # CONFIG_MAX30100 is not set
 
 #
@@ -4543,7 +4613,7 @@ CONFIG_DHT11=m
 # Inertial measurement units
 #
 # CONFIG_KMX61 is not set
-# CONFIG_INV_MPU6050_IIO is not set
+# CONFIG_INV_MPU6050_I2C is not set
 
 #
 # Light sensors
@@ -4585,6 +4655,7 @@ CONFIG_CM32181=m
 # CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
 
 #
 # Inclinometer sensors
@@ -4603,13 +4674,14 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 # Digital potentiometers
 #
 # CONFIG_MCP4531 is not set
+# CONFIG_TPL0102 is not set
 
 #
 # Pressure sensors
 #
 # CONFIG_BMP280 is not set
 # CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_MPL115 is not set
+# CONFIG_MPL115_I2C is not set
 CONFIG_MPL3115=m
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
@@ -4638,7 +4710,6 @@ CONFIG_IIO_ST_PRESS_I2C=m
 # CONFIG_VME_BUS is not set
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
-CONFIG_TS4800_IRQ=m
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_FMC is not set
@@ -4666,13 +4737,10 @@ CONFIG_THUNDERBOLT=m
 #
 # CONFIG_ANDROID is not set
 CONFIG_NVMEM=m
-CONFIG_STM=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
+# CONFIG_STM is not set
 CONFIG_INTEL_TH=m
 CONFIG_INTEL_TH_PCI=m
 CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
@@ -4728,6 +4796,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -4775,6 +4844,7 @@ CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_UTF8=y
 # CONFIG_NTFS_FS is not set
 
 #
@@ -4792,6 +4862,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
@@ -4843,7 +4914,8 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
 CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_GRACE_PERIOD=m
@@ -4965,6 +5037,10 @@ CONFIG_DEBUG_KERNEL=y
 #
 CONFIG_PAGE_EXTENSION=y
 # CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
+# CONFIG_PAGE_POISONING_ZERO is not set
+# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
@@ -5026,6 +5102,7 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
@@ -5080,6 +5157,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_BUILD_DOCSRC is not set
 # CONFIG_DMA_API_DEBUG is not set
@@ -5097,7 +5175,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 
 #
@@ -5157,11 +5234,9 @@ CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
@@ -5250,7 +5325,6 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
@@ -5275,7 +5349,6 @@ CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_PUBLIC_KEY_ALGO_RSA=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=m
 # CONFIG_PKCS7_TEST_KEY is not set
@@ -5285,6 +5358,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=m
 #
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 CONFIG_VIRTUALIZATION=y
 CONFIG_BINARY_PRINTF=y
 

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 4747a609b6b83ae8201d00e50924e514ea2b1f11..ac109eadf7fac98e7b435a4599c64ad94b047050 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -61,6 +61,7 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_NUMA_BALANCING is not set
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_PCSPKR_PLATFORM=y
 
 #
@@ -159,6 +160,7 @@ CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_PERF_EVENTS_AMD_POWER=m
 # CONFIG_X86_MSR is not set
 CONFIG_X86_CPUID=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -196,6 +198,8 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
 CONFIG_X86_PMEM_LEGACY_DEVICE=y
 CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -210,6 +214,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
 CONFIG_X86_INTEL_MPX=y
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_MIXED is not set
@@ -330,7 +335,6 @@ CONFIG_I7300_IDLE=m
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIEASPM_DEFAULT is not set
@@ -345,6 +349,8 @@ CONFIG_PCI_IOV=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_LABEL=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # PCI host controller drivers
@@ -364,11 +370,6 @@ CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_TI=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_RAPIDIO is not set
 # CONFIG_X86_SYSFB is not set
 
@@ -411,6 +412,7 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y
 #
 # Bus devices
 #
+CONFIG_OF_DYNAMIC=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
@@ -440,6 +442,7 @@ CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RSXX=m
+CONFIG_NVME_CORE=m
 CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_NVME_SCSI=y
 
@@ -452,6 +455,7 @@ CONFIG_SGI_IOC4=m
 CONFIG_HP_ILO=m
 CONFIG_VMWARE_BALLOON=m
 # CONFIG_SRAM is not set
+# CONFIG_PANEL is not set
 
 #
 # Altera FPGA firmware download module
@@ -472,7 +476,12 @@ CONFIG_INTEL_MIC_BUS=m
 # CONFIG_SCIF_BUS is not set
 
 #
-# Intel MIC Coprocessor State Management (COSM) Drivers
+# VOP Bus Driver
+#
+# CONFIG_VOP_BUS is not set
+
+#
+# VOP Driver
 #
 # CONFIG_GENWQE is not set
 # CONFIG_IDE is not set
@@ -561,6 +570,7 @@ CONFIG_TULIP_NAPI=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
 CONFIG_DE4X5=m
 CONFIG_PCMCIA_XIRCOM=m
+CONFIG_E1000E_HWTS=y
 CONFIG_IGB_DCA=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
@@ -585,7 +595,9 @@ CONFIG_NET_SB1000=m
 #
 # MII PHY device drivers
 #
+CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
 # CONFIG_PLIP is not set
 # CONFIG_WIL6210_TRACING is not set
 CONFIG_AIRO=m
@@ -689,6 +701,7 @@ CONFIG_ACPI_I2C_OPREGION=y
 #
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_DEMUX_PINCTRL=m
 
 #
 # PC SMBus host controller drivers
@@ -768,12 +781,14 @@ CONFIG_GPIO_XILINX=m
 #
 # Port-mapped I/O GPIO drivers
 #
+CONFIG_GPIO_104_DIO_48E=m
 CONFIG_GPIO_104_IDIO_16=m
 CONFIG_GPIO_104_IDI_48=m
 # CONFIG_GPIO_F7188X is not set
 CONFIG_GPIO_IT87=m
 CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SCH311X is not set
+CONFIG_GPIO_WS16C48=m
 
 #
 # MFD GPIO expanders
@@ -839,6 +854,7 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 CONFIG_ALIM1535_WDT=m
+CONFIG_EBC_C384_WDT=m
 CONFIG_F71808E_WDT=m
 CONFIG_SP5100_TCO=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -866,6 +882,8 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_NI903X_WDT=m
 
 #
 # PCI-based Watchdog Cards
@@ -1055,9 +1073,14 @@ CONFIG_VGA_SWITCHEROO=y
 # I2C encoder or helper chips
 #
 CONFIG_DRM_I2C_NXP_TDA998X=m
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
 CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_FBCON is not set
@@ -1204,6 +1227,7 @@ CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ALIENWARE_WMI=m
 CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_SMBIOS=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
@@ -1280,7 +1304,6 @@ CONFIG_PCC=y
 #
 # Generic IOMMU Pagetable Support
 #
-CONFIG_IOMMU_IOVA=y
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_STATS=y
 CONFIG_AMD_IOMMU_V2=m
@@ -1347,6 +1370,8 @@ CONFIG_DMI_SYSFS=y
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -1379,12 +1404,15 @@ CONFIG_EFIVAR_FS=m
 #
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
+CONFIG_STACK_VALIDATION=y
 
 #
 # Memory Debugging
 #
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_ARCH_HAS_KCOV=y
+# CONFIG_KCOV is not set
 
 #
 # Debug Lockups and Hangs
@@ -1439,7 +1467,6 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 # CONFIG_X86_DEBUG_FPU is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
 

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 2ac3fa2d5a70f7abbc1e941d3f33ba40ef1df0f9..3d546b183b86b6f54bec3effe87b12fb6020fbca 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.5.7
+version    = 4.6.7
 release    = 1
 thisapp    = linux-%{version}
 

diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index 397beb836ea3884cd7f244990522aec33d0c362d..7ce8ed5625d0d03d7c7ad39cb25f96f6b7f19fdb 100755 (executable)
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -271,7 +271,7 @@ function diff_configs() {
                filename=${tmpdir}/config-${arch}-${flavour}
 
                case "${config}" in
-                       aarch64:default|armv7hl:default)
+                       aarch64:default|armv7hl:default|x86_64:default)
                                # Virtual configuration
                                rm -f ${filename}
                                continue