kernel: Update to 4.4.10

Disables all staging modules due to build issues.

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index f155390a429dbe44009e07fc185fbedc3824929e..085f04b7a283bbb975b541882d169b80666a51ba 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -59,6 +59,7 @@ CONFIG_PCI_SYSCALL=y
 #
 # PCI host controller drivers
 #
+CONFIG_PCIE_DW=y
 CONFIG_PCI_HOST_GENERIC=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -99,6 +100,7 @@ CONFIG_CPU_FREQ_STAT=y
 #
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
+CONFIG_ARM_SCPI_CPUFREQ=m
 
 #
 # Classification
@@ -157,10 +159,10 @@ CONFIG_OF_RESERVED_MEM=y
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_NVME is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_NVME is not set
 
 #
 # Misc devices
@@ -204,6 +206,13 @@ CONFIG_AMD8111_ETH=y
 # CONFIG_DE2104X is not set
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_TULIP_NAPI is not set
+CONFIG_NET_VENDOR_HISILICON=y
+CONFIG_HIX5HD2_GMAC=m
+CONFIG_HIP04_ETH=m
+CONFIG_HNS_MDIO=m
+CONFIG_HNS=m
+CONFIG_HNS_DSAF=m
+CONFIG_HNS_ENET=m
 # CONFIG_I40E_VXLAN is not set
 # CONFIG_SKGE_GENESIS is not set
 # CONFIG_QLCNIC_VXLAN is not set
@@ -252,6 +261,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
 #
 # Serial drivers
 #
+CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_INGENIC=y
 
 #
@@ -323,6 +333,7 @@ CONFIG_POWER_RESET_VEXPRESS=y
 #
 # Native drivers
 #
+CONFIG_SENSORS_ARM_SCPI=m
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_VEXPRESS=m
 
@@ -430,7 +441,6 @@ CONFIG_DVB_LNBP21=y
 # Console display driver support
 #
 CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
 # CONFIG_SND_ALI5451 is not set
 # CONFIG_SND_ES1968_INPUT is not set
 # CONFIG_SND_MAESTRO3_INPUT is not set
@@ -453,6 +463,11 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -461,6 +476,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_ADAU1701=m
 CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_ALC5623=m
@@ -477,7 +493,6 @@ CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS4349=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_PCM1681=m
@@ -536,7 +551,6 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC_ARMMMCI=m
 # CONFIG_MMC_RICOH_MMC is not set
 CONFIG_MMC_DW=m
-CONFIG_MMC_DW_IDMAC=y
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_K3=m
@@ -569,11 +583,6 @@ CONFIG_RTC_DRV_PL031=m
 # CONFIG_UIO_PCI_GENERIC is not set
 # CONFIG_UIO_MF624 is not set
 
-#
-# Android
-#
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-
 #
 # Common Clock Framework
 #
@@ -582,12 +591,15 @@ CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
 CONFIG_COMMON_CLK_MAX77686=y
+CONFIG_COMMON_CLK_SCPI=m
+CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_PWM=m
 
 #
 # Clock Source drivers
 #
 CONFIG_CLKSRC_OF=y
+CONFIG_CLKSRC_PROBE=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
@@ -602,7 +614,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 
 #
-# DEVFREQ Drivers
+# Extcon Device Drivers
 #
 CONFIG_ARM_PL172_MPMC=m
 
@@ -623,11 +635,18 @@ CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_TWL is not set
 # CONFIG_PWM_TWL_LED is not set
 CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_V3=y
+
+#
+# Performance monitor support
+#
+CONFIG_ARM_PMU=y
 
 #
 # Firmware Drivers
 #
 CONFIG_ARM_PSCI_FW=y
+CONFIG_ARM_SCPI_PROTOCOL=m
 # CONFIG_FIRMWARE_MEMMAP is not set
 
 #

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index a647b856b904b48a4799025dd9a1c63347ee6ee1..ca3f8ba982959c20cea0b64e787c7543d210a019 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -62,7 +62,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_SHMOBILE_LEGACY is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
@@ -88,6 +87,7 @@ CONFIG_ARCH_BCM=y
 #
 CONFIG_ARCH_BCM_IPROC=y
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM_5301X=y
 
 #
@@ -120,6 +120,7 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MESON=y
 CONFIG_MACH_MESON6=y
 CONFIG_MACH_MESON8=y
+CONFIG_MACH_MESON8B=y
 CONFIG_ARCH_MXC=y
 
 #
@@ -249,9 +250,8 @@ CONFIG_ARCH_R8A7779=y
 # CONFIG_ARCH_SH73A0 is not set
 
 #
-# Timer and clock configuration
+# Renesas ARM SoCs System Configuration
 #
-CONFIG_SHMOBILE_TIMER_HZ=128
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_MACH_SUN5I=y
@@ -352,12 +352,10 @@ CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
 # CONFIG_ARM_ERRATA_773022 is not set
 CONFIG_ICST=y
-CONFIG_TI_PRIV_EDMA=y
 
 #
 # PCI host controller drivers
 #
-CONFIG_PCIE_DW=y
 CONFIG_PCI_EXYNOS=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
@@ -369,6 +367,7 @@ CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCIE_IPROC=y
 CONFIG_PCIE_IPROC_PLATFORM=m
 # CONFIG_PCIE_IPROC_BCMA is not set
+CONFIG_PCIE_ALTERA=y
 # CONFIG_PCCARD is not set
 
 #
@@ -381,6 +380,7 @@ CONFIG_MCPM_QUAD_CLUSTER=y
 CONFIG_BIG_LITTLE=y
 # CONFIG_BL_SWITCHER is not set
 CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
@@ -389,7 +389,6 @@ CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=1024
 CONFIG_HZ_FIXED=200
 CONFIG_HZ=200
-CONFIG_SCHED_HRTICK=y
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
 CONFIG_ARM_ASM_UNIFIED=y
@@ -433,7 +432,6 @@ CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
 CONFIG_ARM_HISI_ACPU_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
-CONFIG_ARM_MT8173_CPUFREQ=y
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=m
@@ -482,6 +480,7 @@ CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_OMAP_INTERCONNECT=y
 # CONFIG_OMAP_OCP2SCP is not set
 CONFIG_SIMPLE_PM_BUS=y
+CONFIG_SUNXI_RSB=m
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_MG_DISK is not set
 
@@ -492,14 +491,14 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_ARM_CHARLCD is not set
 
 #
-# SCIF Driver
+# Intel MIC Coprocessor State Management (COSM) Drivers
 #
 # CONFIG_IDE is not set
 
 #
 # SCSI Transports
 #
-CONFIG_SCSI_UFS_QCOM=y
+CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_NSP32=m
 
 #
@@ -543,9 +542,6 @@ CONFIG_FEC=m
 CONFIG_FSL_PQ_MDIO=m
 CONFIG_FSL_XGMAC_MDIO=m
 CONFIG_GIANFAR=m
-CONFIG_NET_VENDOR_HISILICON=y
-CONFIG_HIX5HD2_GMAC=m
-CONFIG_HIP04_ETH=m
 CONFIG_PXA168_ETH=m
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
@@ -565,6 +561,7 @@ CONFIG_NET_VENDOR_XILINX=y
 # MII PHY device drivers
 #
 CONFIG_MDIO_SUN4I=m
+CONFIG_MDIO_BCM_IPROC=m
 
 #
 # Input device support
@@ -617,6 +614,7 @@ CONFIG_SERIAL_SIRFSOC=m
 CONFIG_SERIAL_IMX=m
 CONFIG_SERIAL_SH_SCI=m
 CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+CONFIG_SERIAL_SH_SCI_DMA=y
 # CONFIG_SERIAL_MSM is not set
 # CONFIG_SERIAL_VT8500 is not set
 CONFIG_SERIAL_OMAP=m
@@ -629,6 +627,7 @@ CONFIG_HW_RANDOM_OMAP=y
 CONFIG_HW_RANDOM_OMAP3_ROM=y
 CONFIG_HW_RANDOM_EXYNOS=y
 CONFIG_HW_RANDOM_MSM=m
+CONFIG_HW_RANDOM_ST=m
 CONFIG_NVRAM=y
 
 #
@@ -717,6 +716,11 @@ CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
 # CONFIG_PINCTRL_PALMAS is not set
 CONFIG_PINCTRL_ZYNQ=y
+CONFIG_PINCTRL_BERLIN=y
+# CONFIG_PINCTRL_BERLIN_BG2 is not set
+# CONFIG_PINCTRL_BERLIN_BG2CD is not set
+# CONFIG_PINCTRL_BERLIN_BG2Q is not set
+CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
@@ -756,6 +760,7 @@ CONFIG_PINCTRL_SUN6I_A31_R=y
 CONFIG_PINCTRL_SUN7I_A20=y
 CONFIG_PINCTRL_SUN8I_A23=y
 CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_A23_R=y
 CONFIG_PINCTRL_SUN9I_A80=y
 # CONFIG_PINCTRL_WM8850 is not set
@@ -772,7 +777,6 @@ CONFIG_GPIO_BRCMSTB=m
 # CONFIG_GPIO_DAVINCI is not set
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EM is not set
-CONFIG_GPIO_MSM_V2=m
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
 # CONFIG_GPIO_RCAR is not set
@@ -785,6 +789,7 @@ CONFIG_GPIO_ZYNQ=m
 # USB GPIO expanders
 #
 # CONFIG_APM_POWER is not set
+# CONFIG_CHARGER_QCOM_SMBB is not set
 CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_IMX=y
@@ -927,17 +932,30 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 #
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_DRM_EXYNOS=m
+
+#
+# CRTCs
+#
 # CONFIG_DRM_EXYNOS_FIMD is not set
 CONFIG_DRM_EXYNOS5433_DECON=y
 # CONFIG_DRM_EXYNOS7_DECON is not set
+CONFIG_DRM_EXYNOS_MIXER=y
+CONFIG_DRM_EXYNOS_VIDI=y
+
+#
+# Encoders and Bridges
+#
 CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_VIDI=y
+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
-CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_DRM_ARMADA=m
@@ -947,7 +965,6 @@ CONFIG_DRM_RCAR_DU=m
 CONFIG_DRM_SHMOBILE=m
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_MSM=m
-# CONFIG_DRM_MSM_FBDEV is not set
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_DSI_PLL=y
@@ -957,12 +974,12 @@ CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_FBDEV=y
 # CONFIG_DRM_TEGRA_DEBUG is not set
-# CONFIG_DRM_TEGRA_STAGING is not set
 
 #
 # Display Interface Bridges
 #
 CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
 
@@ -983,6 +1000,12 @@ CONFIG_EXYNOS_VIDEO=y
 # CONFIG_EXYNOS_MIPI_DSI is not set
 # CONFIG_FB_SH_MOBILE_MERAM is not set
 
+#
+# Console display driver support
+#
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+
 #
 # HD-Audio
 #
@@ -1024,6 +1047,7 @@ CONFIG_SND_SOC_STORM=m
 CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_SAMSUNG=m
@@ -1048,6 +1072,10 @@ CONFIG_SND_SOC_SIRF_AUDIO=m
 CONFIG_SND_SOC_SIRF_AUDIO_PORT=m
 CONFIG_SND_SOC_SIRF_USP=m
 CONFIG_SND_SOC_STI=m
+
+#
+# Allwinner SoC Audio support
+#
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
@@ -1085,6 +1113,7 @@ CONFIG_USB_IMX21_HCD=y
 #
 # Platform Glue Layer
 #
+CONFIG_USB_MUSB_SUNXI=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
@@ -1102,6 +1131,7 @@ CONFIG_USB_UX500_DMA=y
 #
 # Platform Glue Driver Support
 #
+CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_EXYNOS=m
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_USB_DWC3_ST=m
@@ -1114,12 +1144,15 @@ CONFIG_USB_DWC3_QCOM=m
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
+CONFIG_USB_MSM_OTG=m
+CONFIG_USB_QCOM_8X16_PHY=m
 CONFIG_USB_MXS_PHY=m
 CONFIG_USB_RCAR_PHY=m
 
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_S3C=m
@@ -1201,12 +1234,7 @@ CONFIG_RENESAS_USB_DMAC=m
 # CONFIG_SUDMAC is not set
 
 #
-# Speakup console speech
-#
-# CONFIG_MFD_NVEC is not set
-
-#
-# Android
+# Microsoft Hyper-V guest support
 #
 CONFIG_CHROME_PLATFORMS=y
 
@@ -1214,11 +1242,11 @@ CONFIG_CHROME_PLATFORMS=y
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
-CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_COMMON_CLK_IPROC=y
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_STUB_CLK_HI6220=y
+CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
@@ -1258,6 +1286,7 @@ CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_NOMADIK_MTU=y
 CONFIG_CLKSRC_DBX500_PRCMU=y
 CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
+CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_EXYNOS_MCT=y
@@ -1270,6 +1299,7 @@ CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_STI_MBOX=m
 
 #
 # Generic IOMMU Pagetable Support
@@ -1298,14 +1328,16 @@ CONFIG_RPMSG=m
 #
 # SOC (System On Chip) specific Drivers
 #
+CONFIG_SOC_BRCMSTB=y
 # CONFIG_MTK_INFRACFG is not set
 # CONFIG_MTK_PMIC_WRAP is not set
 # CONFIG_MTK_SCPSYS is not set
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_PM=y
+CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMD=m
 CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_SMEM=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SUNXI_SRAM=y
 # CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set
 CONFIG_KEYSTONE_NAVIGATOR_DMA=m
@@ -1316,6 +1348,10 @@ CONFIG_KEYSTONE_NAVIGATOR_DMA=m
 CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
 CONFIG_ARM_TEGRA_DEVFREQ=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
+
+#
+# Extcon Device Drivers
+#
 # CONFIG_TI_AEMIF is not set
 # CONFIG_TI_EMIF is not set
 CONFIG_OMAP_GPMC=y
@@ -1337,7 +1373,11 @@ CONFIG_ROCKCHIP_SARADC=m
 #
 # CONFIG_PWM_AB8500 is not set
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_BERLIN=m
+CONFIG_PWM_BRCMSTB=m
 # CONFIG_PWM_IMX is not set
+# CONFIG_PWM_MTK_DISP is not set
+# CONFIG_PWM_RCAR is not set
 # CONFIG_PWM_RENESAS_TPU is not set
 CONFIG_PWM_ROCKCHIP=m
 # CONFIG_PWM_SAMSUNG is not set
@@ -1377,6 +1417,8 @@ CONFIG_TWL4030_USB=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
 CONFIG_PHY_EXYNOS5250_SATA=m
 CONFIG_PHY_HIX5HD2_SATA=m
+CONFIG_PHY_MT65XX_USB3=m
+CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_EXYNOS4210_USB2=y
 CONFIG_PHY_EXYNOS4X12_USB2=y
@@ -1390,16 +1432,14 @@ CONFIG_PHY_STIH41X_USB=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_BRCMSTB_SATA=m
 
-#
-# Performance monitor support
-#
-CONFIG_ARM_PMU=y
-
 #
 # Android
 #
+CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_QCOM_QFPROM=m
+CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_NVMEM_VF610_OCOTP=m
 
 #
 # Firmware Drivers
@@ -1432,11 +1472,8 @@ CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_IMX_UART_PORT=1
 CONFIG_DEBUG_VF_UART_PORT=1
-CONFIG_DEBUG_LL_INCLUDE="debug/bcm63xx.S"
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
-CONFIG_DEBUG_UART_BCM63XX=y
-CONFIG_DEBUG_UART_PHYS=0xfffe8600
-CONFIG_DEBUG_UART_VIRT=0xfcfe8600
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 
 #
@@ -1462,6 +1499,7 @@ CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_UX500 is not set
+CONFIG_CRYPTO_DEV_MXS_DCP=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 

diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index b97dd842ca82033bc2b22fd0798d15e3600084b4..a4010e7c5ee5fbeeffc7e81e6337df4987cd6933 100644 (file)
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -6,6 +6,13 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+
 #
 # RCU Subsystem
 #
@@ -35,12 +42,13 @@ CONFIG_PREEMPT_NOTIFIERS=y
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_EXYNOS7 is not set
-# CONFIG_ARCH_FSL_LS2085A is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_SEATTLE=y
+# CONFIG_ARCH_STRATIX10 is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_SPRD is not set
 # CONFIG_ARCH_THUNDER is not set
@@ -58,6 +66,7 @@ CONFIG_PCI_LABEL=y
 #
 CONFIG_PCI_XGENE=y
 # CONFIG_PCIE_IPROC is not set
+CONFIG_PCI_HISI=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
@@ -76,13 +85,20 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23154=y
 # CONFIG_ARM64_4K_PAGES is not set
+# CONFIG_ARM64_16K_PAGES is not set
 CONFIG_ARM64_64K_PAGES=y
 CONFIG_ARM64_VA_BITS_42=y
 # CONFIG_ARM64_VA_BITS_48 is not set
 CONFIG_ARM64_VA_BITS=42
 CONFIG_NR_CPUS=64
-CONFIG_HZ=100
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -134,6 +150,7 @@ CONFIG_SYSVIPC_COMPAT=y
 # CPU frequency scaling drivers
 #
 CONFIG_ARM_DT_BL_CPUFREQ=m
+CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
@@ -155,7 +172,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV_SKD=m
 
 #
-# SCIF Driver
+# Intel MIC Coprocessor State Management (COSM) Drivers
 #
 # CONFIG_GENWQE is not set
 
@@ -218,6 +235,7 @@ CONFIG_SERIAL_8250_FINTEK=m
 #
 # Non-8250 serial port support
 #
+CONFIG_HVC_DCC=y
 CONFIG_HW_RANDOM_XGENE=m
 
 #
@@ -238,6 +256,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_CADENCE=m
 CONFIG_I2C_NOMADIK=m
 
 #
@@ -264,9 +283,11 @@ CONFIG_GPIO_ACPI=y
 #
 # Memory mapped GPIO drivers
 #
+CONFIG_GPIO_AMDPT=m
 CONFIG_GPIO_DWAPB=m
 CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_XGENE_SB=m
+CONFIG_GPIO_XILINX=m
 
 #
 # USB GPIO expanders
@@ -309,7 +330,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 # CONFIG_SND_LX6464ES is not set
 
 #
-# Common SoC Audio options for Freescale CPUs:
+# Allwinner SoC Audio support
 #
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 
@@ -360,9 +381,8 @@ CONFIG_XGENE_DMA=m
 CONFIG_DMA_ENGINE_RAID=y
 
 #
-# Android
+# Microsoft Hyper-V guest support
 #
-# CONFIG_FSL_MC_BUS is not set
 # CONFIG_CHROME_PLATFORMS is not set
 
 #
@@ -373,13 +393,16 @@ CONFIG_COMMON_CLK_XGENE=y
 #
 # Clock Source drivers
 #
+CONFIG_CLKSRC_ACPI=y
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_PL320_MBOX is not set
-# CONFIG_PCC is not set
+CONFIG_PCC=y
 
 #
 # Generic IOMMU Pagetable Support
 #
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_DMA=y
 # CONFIG_ARM_SMMU is not set
 CONFIG_ARM_SMMU_V3=y
 
@@ -393,11 +416,6 @@ CONFIG_ARM_SMMU_V3=y
 #
 # CONFIG_ACPI_ALS is not set
 
-#
-# Temperature sensors
-#
-CONFIG_ARM_GIC_V3=y
-
 #
 # PHY Subsystem
 #
@@ -435,11 +453,16 @@ CONFIG_EFI_ARMSTUB=y
 CONFIG_ACPI=y
 CONFIG_ACPI_GENERIC_GSI=y
 CONFIG_ACPI_CCA_REQUIRED=y
+# CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_THERMAL=m
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_PCI_SLOT is not set
@@ -464,6 +487,7 @@ CONFIG_KVM_MMIO=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_KVM_COMPAT=y
+CONFIG_KVM_ARM_VGIC_V3=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 

diff --git a/kernel/config-generic b/kernel/config-generic
index 1ab2414deeae8e3c6547235a5ed5b2fe8817dfa8..34efb895349da36124a17d658344265e10b286fa 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -209,7 +209,6 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -283,7 +282,6 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -305,6 +303,7 @@ CONFIG_ZPOOL=m
 CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_FRAME_VECTOR=y
 CONFIG_SECCOMP=y
+CONFIG_SCHED_HRTICK=y
 CONFIG_HOTPLUG_CPU=y
 
 #
@@ -532,7 +531,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_PROTO_DCCP=m
@@ -908,6 +907,7 @@ CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
 # CONFIG_HSR is not set
 CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -981,6 +981,7 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
 CONFIG_LIB80211=m
@@ -1096,7 +1097,7 @@ CONFIG_ENCLOSURE_SERVICES=m
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 CONFIG_DS1682=m
-CONFIG_BMP085=y
+CONFIG_BMP085=m
 CONFIG_BMP085_I2C=m
 CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_C2PORT is not set
@@ -1142,6 +1143,10 @@ CONFIG_ALTERA_STAPL=m
 #
 # SCIF Driver
 #
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_KERNEL_API is not set
@@ -1217,12 +1222,10 @@ CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
 CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT3SAS_LOGGING is not set
+CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 CONFIG_SCSI_UFSHCD_PLATFORM=m
@@ -1279,6 +1282,7 @@ CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
+CONFIG_AHCI_QORIQ=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=m
@@ -1444,6 +1448,10 @@ CONFIG_ATM_TCP=m
 #
 # CAIF transport drivers
 #
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
 # Distributed Switch Architecture drivers
@@ -1480,6 +1488,8 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
 CONFIG_NET_CADENCE=y
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
@@ -1493,6 +1503,7 @@ CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_VXLAN=y
 CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CAVIUM=y
@@ -1540,7 +1551,6 @@ CONFIG_IXGBE_VXLAN=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_I40E=m
 CONFIG_NET_VENDOR_I825XX=y
-CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
@@ -1557,6 +1567,7 @@ CONFIG_MLX4_CORE=m
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_PCI=m
 CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLXSW_SPECTRUM=m
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851_MLL is not set
@@ -1582,6 +1593,8 @@ CONFIG_QLCNIC=m
 CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=m
@@ -1660,6 +1673,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_TERANETICS_PHY=m
 CONFIG_SMSC_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
 CONFIG_BROADCOM_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
@@ -1745,10 +1759,10 @@ CONFIG_AT76C50X_USB=m
 # CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_ADM8211=m
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_MWL8K=m
 CONFIG_ATH_COMMON=m
@@ -1904,6 +1918,8 @@ CONFIG_RTLWIFI_USB=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
@@ -2021,6 +2037,10 @@ CONFIG_CAPI_EICON=y
 # CONFIG_HYSDN is not set
 # CONFIG_MISDN is not set
 CONFIG_ISDN_HDLC=m
+CONFIG_NVM=y
+# CONFIG_NVM_DEBUG is not set
+CONFIG_NVM_GENNVM=m
+CONFIG_NVM_RRPC=m
 
 #
 # Input device support
@@ -2145,6 +2165,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_PS2MULT is not set
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
+# CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -2187,6 +2208,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_MID=m
 
 #
 # Non-8250 serial port support
@@ -2355,9 +2378,13 @@ CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_74XX_MMIO=m
 CONFIG_GPIO_ALTERA=m
 CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_SCH311X is not set
 CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_VX855 is not set
+CONFIG_GPIO_ZX=y
+
+#
+# Port-mapped I/O GPIO drivers
+#
 
 #
 # I2C GPIO expanders
@@ -2399,6 +2426,11 @@ CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set
 
+#
+# SPI or I2C GPIO expanders
+#
+CONFIG_GPIO_MCP23S08=m
+
 #
 # USB GPIO expanders
 #
@@ -2413,7 +2445,8 @@ CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_AXP288_CHARGER is not set
 CONFIG_AXP288_FUEL_GAUGE=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
@@ -2434,6 +2467,7 @@ CONFIG_CHARGER_MAX77693=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
+# CONFIG_AXP20X_POWER is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
@@ -2501,6 +2535,7 @@ CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_HTU21=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_MENF21BMC_HWMON=m
@@ -2602,6 +2637,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 CONFIG_IMX_THERMAL=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
@@ -2631,6 +2667,7 @@ 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
 
 #
@@ -2654,6 +2691,7 @@ CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_HOST_SOC=y
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
@@ -2682,6 +2720,7 @@ 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_PMIC_DA903X=y
@@ -3445,6 +3484,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
+# CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
@@ -3505,6 +3545,7 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
@@ -3661,6 +3702,7 @@ CONFIG_HID_BELKIN=y
 # CONFIG_HID_BETOP_FF is not set
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
+CONFIG_HID_CORSAIR=m
 # CONFIG_HID_PRODIKEYS is not set
 CONFIG_HID_CP2112=m
 CONFIG_HID_CYPRESS=y
@@ -3670,6 +3712,7 @@ CONFIG_HID_CYPRESS=y
 # CONFIG_HID_ELO is not set
 CONFIG_HID_EZKEY=y
 # CONFIG_HID_GEMBIRD is not set
+# CONFIG_HID_GFRM is not set
 # CONFIG_HID_HOLTEK is not set
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
@@ -3775,7 +3818,6 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
 CONFIG_USB_FOTG210_HCD=m
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
@@ -3961,13 +4003,14 @@ CONFIG_USB_XUSBATM=m
 CONFIG_USB_PHY=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
 # CONFIG_USB_GADGET is not set
 CONFIG_USB_LED_TRIG=y
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4146,6 +4189,7 @@ CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
 
 #
@@ -4203,9 +4247,8 @@ CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 CONFIG_FSL_EDMA=m
-CONFIG_IDMA64=m
+CONFIG_INTEL_IDMA64=m
 CONFIG_HSU_DMA=m
-CONFIG_HSU_DMA_PCI=m
 
 #
 # DMA Clients
@@ -4236,120 +4279,7 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
-CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
-# CONFIG_R8712U is not set
-# CONFIG_R8188EU is not set
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_RTS5208=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7606 is not set
-
-#
-# Analog digital bi-direction converters
-#
-# CONFIG_ADT7316 is not set
-
-#
-# Capacitance to digital converters
-#
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7746 is not set
-
-#
-# Direct Digital Synthesis
-#
-
-#
-# Digital gyroscope sensors
-#
-
-#
-# Network Analyzer, Impedance Converters
-#
-# CONFIG_AD5933 is not set
-
-#
-# Light sensors
-#
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-
-#
-# Resolver to digital converters
-#
-
-#
-# Triggers - standalone
-#
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_FB_SM750 is not set
-# CONFIG_FB_XGI is not set
-# CONFIG_FT1000 is not set
-
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_WIMAX_GDM72XX is not set
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_DGNC is not set
-# CONFIG_DGAP is not set
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_MOST=m
-CONFIG_MOSTCORE=m
-CONFIG_AIM_CDEV=m
-CONFIG_AIM_NETWORK=m
-CONFIG_AIM_SOUND=m
-CONFIG_AIM_V4L2=m
-CONFIG_HDM_DIM2=m
-CONFIG_HDM_I2C=m
-CONFIG_HDM_USB=m
+# CONFIG_STAGING is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4361,6 +4291,7 @@ CONFIG_COMMON_CLK_MAX_GEN=y
 CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI514=m
 CONFIG_COMMON_CLK_SI570=m
 CONFIG_COMMON_CLK_CDCE925=m
 CONFIG_COMMON_CLK_S2MPS11=m
@@ -4382,6 +4313,7 @@ CONFIG_COMMON_CLK_CDCE706=m
 # CONFIG_EM_TIMER_STI is not set
 CONFIG_MAILBOX=y
 CONFIG_ALTERA_MBOX=m
+# CONFIG_MAILBOX_TEST is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 
@@ -4417,11 +4349,26 @@ CONFIG_DEVFREQ_GOV_USERSPACE=m
 # DEVFREQ Drivers
 #
 CONFIG_PM_DEVFREQ_EVENT=y
-# CONFIG_EXTCON is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
 CONFIG_MEMORY=y
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=y
+CONFIG_IIO_BUFFER_CB=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_TRIGGER=y
@@ -4438,6 +4385,7 @@ CONFIG_KXCJK1013=m
 # CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
 
@@ -4462,6 +4410,11 @@ CONFIG_VF610_ADC=m
 # Amplifiers
 #
 
+#
+# Chemical Sensors
+#
+# CONFIG_VZ89X is not set
+
 #
 # Hid Sensor IIO Common
 #
@@ -4509,6 +4462,8 @@ CONFIG_MAX5821=m
 # Humidity sensors
 #
 CONFIG_DHT11=m
+# CONFIG_HDC100X is not set
+# CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
 # CONFIG_SI7020 is not set
 
@@ -4524,6 +4479,7 @@ CONFIG_DHT11=m
 # CONFIG_ADJD_S311 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
 # CONFIG_BH1750 is not set
 CONFIG_CM32181=m
 # CONFIG_CM3232 is not set
@@ -4544,6 +4500,7 @@ CONFIG_CM32181=m
 # CONFIG_TCS3472 is not set
 # CONFIG_SENSORS_TSL2563 is not set
 # CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
 
 #
@@ -4551,11 +4508,11 @@ CONFIG_CM32181=m
 #
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN is not set
 # CONFIG_MAG3110 is not set
 # CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_BMC150_MAGN is not set
 
 #
 # Inclinometer sensors
@@ -4569,6 +4526,11 @@ CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 
+#
+# Digital potentiometers
+#
+# CONFIG_MCP4531 is not set
+
 #
 # Pressure sensors
 #
@@ -4577,6 +4539,7 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 # CONFIG_MPL115 is not set
 CONFIG_MPL3115=m
 # CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
 CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 # CONFIG_T5403 is not set
@@ -4588,6 +4551,7 @@ CONFIG_IIO_ST_PRESS_I2C=m
 #
 # Proximity sensors
 #
+# CONFIG_LIDAR_LITE_V2 is not set
 # CONFIG_SX9500 is not set
 
 #
@@ -4595,6 +4559,8 @@ CONFIG_IIO_ST_PRESS_I2C=m
 #
 # CONFIG_MLX90614 is not set
 # CONFIG_TMP006 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 CONFIG_IRQCHIP=y
@@ -4625,6 +4591,21 @@ CONFIG_THUNDERBOLT=m
 #
 # CONFIG_ANDROID is not set
 CONFIG_NVMEM=m
+CONFIG_STM=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+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
+
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
 
 #
 # Firmware Drivers
@@ -4897,6 +4878,7 @@ CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_FS=y
 CONFIG_HEADERS_CHECK=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@@ -5002,6 +4984,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_TRACE_ENUM_MAP_FILE is not set
+CONFIG_TRACING_EVENTS_GPIO=y
 
 #
 # Runtime Testing
@@ -5017,6 +5000,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_BUILD_DOCSRC is not set
 # CONFIG_DMA_API_DEBUG is not set
@@ -5125,6 +5109,7 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_KEYWRAP=m
 
 #
 # Hash modes

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index adc0cc37f08d1e97a278e1ab0208d9f774bf506e..47d5994c268b20b2c6701d75477a7c4a975506b2 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -136,7 +136,6 @@ CONFIG_X86_LONGRUN=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 # CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
 
 #
 # PCI host controller drivers
@@ -324,9 +323,8 @@ CONFIG_LEDS_OT200=m
 CONFIG_PCH_DMA=m
 
 #
-# Android
+# Microsoft Hyper-V guest support
 #
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_TC1100_WMI=m
 CONFIG_INTEL_IMR=y
 

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index 328bad8d64f3ed39127d4561ee17a8b4e3440132..bafe9ab1dadf2d20e2d135ca9cdbac7b8ee2f0f1 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -122,11 +122,6 @@ CONFIG_LEDS_PWM=m
 #
 # Microsoft Hyper-V guest support
 #
-# CONFIG_FB_OLPC_DCON is not set
-
-#
-# Android
-#
 CONFIG_XO1_RFKILL=m
 # CONFIG_XO15_EBOOK is not set
 

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 6a652ea46940a83b0b15bdac9c68628fbaf45a2a..f9c44638e5839ad567f9a20b90a22390592f3895 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -109,7 +109,7 @@ CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_THERMAL_VECTOR=y
 # CONFIG_VM86 is not set
 CONFIG_I8K=m
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
@@ -154,7 +154,6 @@ CONFIG_EFI_STUB=y
 CONFIG_HZ_300=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_RELOCATABLE=y
@@ -175,6 +174,7 @@ CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
@@ -262,6 +262,7 @@ CONFIG_PCI_STUB=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_PASID=y
 CONFIG_PCI_LABEL=y
 
 #
@@ -341,11 +342,11 @@ CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_NVME=m
 
 #
 # Misc devices
@@ -364,7 +365,7 @@ CONFIG_INTEL_MEI_TXE=m
 CONFIG_VMWARE_VMCI=m
 
 #
-# SCIF Driver
+# Intel MIC Coprocessor State Management (COSM) Drivers
 #
 # CONFIG_IDE is not set
 
@@ -430,14 +431,6 @@ CONFIG_ATM_HE=m
 # CONFIG_ATM_HE_USE_SUNI is not set
 CONFIG_ATM_SOLOS=m
 
-#
-# CAIF transport drivers
-#
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
 #
 # Distributed Switch Architecture drivers
 #
@@ -445,6 +438,7 @@ CONFIG_VORTEX=m
 CONFIG_AMD8111_ETH=m
 CONFIG_MACB=m
 CONFIG_BNX2X_SRIOV=y
+CONFIG_BNXT_SRIOV=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CX_ECAT=m
 CONFIG_DE2104X=m
@@ -538,6 +532,7 @@ CONFIG_NOZOMI=m
 # Serial drivers
 #
 CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_FSL is not set
 CONFIG_SERIAL_8250_FINTEK=m
 
 #
@@ -631,21 +626,29 @@ CONFIG_PINCTRL_PALMAS=y
 # CONFIG_PINCTRL_BAYTRAIL is not set
 CONFIG_PINCTRL_CHERRYVIEW=m
 CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_SUNRISEPOINT=m
 CONFIG_GPIO_ACPI=y
 
 #
 # Memory mapped GPIO drivers
 #
+CONFIG_GPIO_AMDPT=m
 CONFIG_GPIO_DWAPB=m
-# CONFIG_GPIO_F7188X is not set
 CONFIG_GPIO_GRGPIO=m
 CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_LYNXPOINT is not set
-CONFIG_GPIO_SCH=m
 CONFIG_GPIO_XILINX=m
 
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_104_IDIO_16=m
+# CONFIG_GPIO_F7188X is not set
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+# CONFIG_GPIO_SCH311X is not set
+
 #
 # PCI GPIO expanders
 #
@@ -1048,17 +1051,12 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_MF624=m
+CONFIG_IRQ_BYPASS_MANAGER=m
 
 #
 # Microsoft Hyper-V guest support
 #
 # CONFIG_HYPERV is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_PANEL is not set
-
-#
-# Android
-#
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -1101,6 +1099,7 @@ CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
 # CONFIG_IBM_RTL is not set
@@ -1139,6 +1138,7 @@ CONFIG_PCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
@@ -1207,6 +1207,7 @@ CONFIG_EFI_VARS=y
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+# CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_UEFI_CPER=y
 
@@ -1264,8 +1265,11 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 CONFIG_EARLY_PRINTK_EFI=y
+CONFIG_X86_PTDUMP_CORE=y
 # CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
 CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_DEBUG_WX=y
 CONFIG_DEBUG_NX_TEST=m
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index 47c7290ab1b34c85bc4898ad190901fb0668dadb..4dc0eb82d20317c42cf5c896aed4decd0115c993 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -87,6 +87,9 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
+# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_LIVEPATCH is not set
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 
@@ -105,7 +108,6 @@ CONFIG_I7300_IDLE=m
 # Bus options (PCI etc.)
 #
 CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
 
 #
 # PC-card bridges
@@ -153,7 +155,7 @@ CONFIG_INTEL_MIC_BUS=m
 # CONFIG_SCIF_BUS is not set
 
 #
-# SCIF Driver
+# Intel MIC Coprocessor State Management (COSM) Drivers
 #
 # CONFIG_GENWQE is not set
 
@@ -229,13 +231,6 @@ CONFIG_INTEL_MIC_X100_DMA=m
 CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DCA=m
 
-#
-# Android
-#
-CONFIG_CRYPTO_SKEIN=y
-# CONFIG_UNISYSSPAR is not set
-CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
-
 #
 # Generic IOMMU Pagetable Support
 #

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index ed1f2d0c42e5872e9b3165667362e2514d27e2b4..1514f502ac917cc2d1e192145bac0a8befdd6153 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.3.6
+version    = 4.4.10
 release    = 1
 thisapp    = linux-%{version}