kernel: Update to 4.3.6

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index f0abbd14fb170b55efac1f2e27324c199b5cb718..f155390a429dbe44009e07fc185fbedc3824929e 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -1,5 +1,3 @@
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_PGTABLE_LEVELS=2
 
@@ -29,8 +27,9 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING=y
-CONFIG_RCU_USER_QS=y
+CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
 # CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -38,6 +37,7 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_CLONE_BACKWARDS=y
 
 #
@@ -59,6 +59,7 @@ CONFIG_PCI_SYSCALL=y
 #
 # PCI host controller drivers
 #
+CONFIG_PCI_HOST_GENERIC=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
 CONFIG_PCIEASPM_DEFAULT=y
@@ -452,7 +453,6 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -476,8 +476,10 @@ CONFIG_SND_SOC_CS4271=m
 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
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
@@ -493,6 +495,7 @@ CONFIG_SND_SOC_SSM2602_I2C=m
 CONFIG_SND_SOC_SSM4567=m
 CONFIG_SND_SOC_STA32X=m
 CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
 CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS5086=m
 CONFIG_SND_SOC_TAS571X=m
@@ -554,9 +557,9 @@ CONFIG_RTC_DRV_PL031=m
 # DMA Devices
 #
 # CONFIG_AMBA_PL08X is not set
+# CONFIG_PL330_DMA is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
-# CONFIG_PL330_DMA is not set
 
 #
 # DMA Clients
@@ -598,6 +601,11 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 
+#
+# DEVFREQ Drivers
+#
+CONFIG_ARM_PL172_MPMC=m
+
 #
 # Analog to digital converters
 #
@@ -619,6 +627,7 @@ CONFIG_ARM_GIC=y
 #
 # Firmware Drivers
 #
+CONFIG_ARM_PSCI_FW=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 
 #

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 31b7ecf60a85f0d188fb746b79a99ecedea6bc7b..a647b856b904b48a4799025dd9a1c63347ee6ee1 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -9,7 +9,6 @@ CONFIG_ARCH_HAS_BANDGAP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_GENERIC_BUG=y
 
 #
 # General setup
@@ -30,7 +29,6 @@ CONFIG_CONTEXT_TRACKING_FORCE=y
 #
 # CONFIG_KPROBES is not set
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_OLD_SIGACTION=y
@@ -134,6 +132,7 @@ CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
+# CONFIG_SOC_IMX6UL is not set
 # CONFIG_SOC_IMX7D is not set
 # CONFIG_SOC_LS1021A is not set
 
@@ -174,6 +173,7 @@ CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
 CONFIG_SOC_DRA7XX=y
 CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_OMAP_INTERCONNECT_BARRIER=y
 
 #
 # TI OMAP2/3/4 Specific Features
@@ -189,8 +189,6 @@ CONFIG_OMAP_PACKAGE_CBB=y
 # OMAP Legacy Platform Data Board Type
 #
 CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OMAP3530_LV_SOM=y
-CONFIG_MACH_OMAP3_TORPEDO=y
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_NOKIA_RX51=y
@@ -208,6 +206,7 @@ CONFIG_SOC_STIH416=y
 CONFIG_SOC_STIH407=y
 # CONFIG_ARCH_S5PV210 is not set
 CONFIG_ARCH_EXYNOS=y
+CONFIG_S5P_DEV_MFC=y
 # CONFIG_ARCH_EXYNOS3 is not set
 CONFIG_ARCH_EXYNOS4=y
 CONFIG_ARCH_EXYNOS5=y
@@ -229,11 +228,6 @@ CONFIG_SOC_EXYNOS5800=y
 CONFIG_EXYNOS_CPU_SUSPEND=y
 CONFIG_PLAT_SAMSUNG=y
 
-#
-# Boot options
-#
-CONFIG_S5P_DEV_MFC=y
-
 #
 # Power management
 #
@@ -250,14 +244,10 @@ CONFIG_ARCH_SHMOBILE_MULTI=y
 CONFIG_ARCH_R8A7779=y
 # CONFIG_ARCH_R8A7790 is not set
 # CONFIG_ARCH_R8A7791 is not set
+# CONFIG_ARCH_R8A7793 is not set
 # CONFIG_ARCH_R8A7794 is not set
 # CONFIG_ARCH_SH73A0 is not set
 
-#
-# Renesas ARM SoCs Board Type
-#
-CONFIG_MACH_MARZEN=y
-
 #
 # Timer and clock configuration
 #
@@ -348,6 +338,7 @@ CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
 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_MULTI_IRQ_HANDLER=y
@@ -372,7 +363,6 @@ CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_RCAR_GEN2=y
 CONFIG_PCI_RCAR_GEN2_PCIE=y
-CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_KEYSTONE=y
 CONFIG_PCIE_XILINX=y
 CONFIG_PCI_LAYERSCAPE=y
@@ -408,6 +398,7 @@ CONFIG_AEABI=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
+CONFIG_CPU_SW_DOMAIN_PAN=y
 # CONFIG_ARM_MODULE_PLTS is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
@@ -438,16 +429,14 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
-CONFIG_ARM_EXYNOS_CPUFREQ=y
-CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
-CONFIG_ARM_EXYNOS5250_CPUFREQ=y
-# CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW is not set
 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_TEGRA_CPUFREQ=y
+CONFIG_ARM_TEGRA20_CPUFREQ=y
+CONFIG_ARM_TEGRA124_CPUFREQ=m
 CONFIG_QORIQ_CPUFREQ=m
 
 #
@@ -499,13 +488,9 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 #
 # Misc devices
 #
+# CONFIG_QCOM_COINCELL is not set
 # CONFIG_ARM_CHARLCD is not set
 
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_SUNXI_SID is not set
-
 #
 # SCIF Driver
 #
@@ -594,6 +579,7 @@ CONFIG_INPUT_MATRIXKMAP=y
 #
 # Input Device Drivers
 #
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NOMADIK is not set
 CONFIG_KEYBOARD_TEGRA=m
@@ -629,7 +615,6 @@ CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 CONFIG_SERIAL_SIRFSOC=m
 CONFIG_SERIAL_IMX=m
-# CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_SH_SCI=m
 CONFIG_SERIAL_SH_SCI_NR_UARTS=2
 # CONFIG_SERIAL_MSM is not set
@@ -754,6 +739,7 @@ CONFIG_PINCTRL_MSM8960=m
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
@@ -826,7 +812,7 @@ CONFIG_DB8500_CPUFREQ_COOLING=y
 #
 # Samsung thermal drivers
 #
-CONFIG_EXYNOS_THERMAL=m
+CONFIG_EXYNOS_THERMAL=y
 
 #
 # STMicroelectronics thermal drivers
@@ -856,6 +842,7 @@ CONFIG_BCM47XX_WDT=m
 # Multifunction device drivers
 #
 CONFIG_MFD_ATMEL_HLCDC=m
+# CONFIG_MFD_CROS_EC is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
 CONFIG_MFD_PM8XXX=m
@@ -885,6 +872,7 @@ CONFIG_REGULATOR_LP872X=y
 CONFIG_REGULATOR_LP8788=y
 CONFIG_REGULATOR_PBIAS=m
 CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_TWL4030=y
 
@@ -915,8 +903,15 @@ CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 CONFIG_VIDEO_STI_BDISP=m
+# CONFIG_VIDEO_RENESAS_JPU is not set
 CONFIG_VIDEO_RENESAS_VSP1=m
 # CONFIG_VIDEO_TI_VPE is not set
+CONFIG_DVB_C8SECTPFE=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_STV0367=m
 
 #
 # Graphics support
@@ -924,17 +919,12 @@ CONFIG_VIDEO_RENESAS_VSP1=m
 CONFIG_TEGRA_HOST1X=y
 CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
-
-#
-# Direct Rendering Manager
-#
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 
 #
 # I2C encoder or helper chips
 #
-CONFIG_DRM_DW_HDMI=m
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_DRM_EXYNOS=m
 # CONFIG_DRM_EXYNOS_FIMD is not set
@@ -961,14 +951,18 @@ CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+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 Panels
+# Display Interface Bridges
 #
+CONFIG_DRM_DW_HDMI=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
 
@@ -1021,6 +1015,7 @@ CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_MEDIATEK=m
 CONFIG_SND_SOC_MT8173_MAX98090=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
+CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC_LPASS_IPQ806X=m
@@ -1029,6 +1024,8 @@ 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_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SAMSUNG_PCM=m
 CONFIG_SND_SAMSUNG_SPDIF=m
@@ -1050,6 +1047,7 @@ CONFIG_SND_SOC_SIRF=m
 CONFIG_SND_SOC_SIRF_AUDIO=m
 CONFIG_SND_SOC_SIRF_AUDIO_PORT=m
 CONFIG_SND_SOC_SIRF_USP=m
+CONFIG_SND_SOC_STI=m
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
@@ -1092,10 +1090,14 @@ CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_UX500=m
 CONFIG_USB_MUSB_AM335X_CHILD=m
+
+#
+# MUSB DMA mode
+#
+# CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_USB_UX500_DMA=y
 # CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_TI_CPPI41_DMA is not set
-# CONFIG_MUSB_PIO_ONLY is not set
 
 #
 # Platform Glue Driver Support
@@ -1118,7 +1120,6 @@ CONFIG_USB_RCAR_PHY=m
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_S3C=m
@@ -1173,33 +1174,31 @@ CONFIG_RTC_DRV_ST_LPC=m
 #
 # DMA Devices
 #
+CONFIG_AXI_DMAC=m
+# CONFIG_DMA_OMAP is not set
+CONFIG_DMA_SUN4I=m
+CONFIG_DMA_SUN6I=m
+# CONFIG_IMX_DMA is not set
+# CONFIG_IMX_SDMA is not set
+# CONFIG_K3_DMA is not set
+# CONFIG_MXS_DMA is not set
 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_RENESAS_DMA=y
 CONFIG_SH_DMAE_BASE=y
 # CONFIG_SH_DMAE is not set
-# CONFIG_SUDMAC is not set
-# CONFIG_RCAR_HPB_DMAE is not set
 CONFIG_RCAR_DMAC=m
+# CONFIG_RCAR_HPB_DMAE is not set
 CONFIG_RENESAS_USB_DMAC=m
-# CONFIG_STE_DMA40 is not set
-# CONFIG_SIRF_DMA is not set
-# CONFIG_TI_EDMA is not set
-# CONFIG_IMX_SDMA is not set
-# CONFIG_IMX_DMA is not set
-# CONFIG_MXS_DMA is not set
-# CONFIG_DMA_OMAP is not set
-# CONFIG_TI_CPPI41 is not set
-# CONFIG_K3_DMA is not set
-CONFIG_XILINX_VDMA=m
-CONFIG_DMA_SUN6I=m
-CONFIG_NBPFAXI_DMA=m
-
-#
-# DMA Clients
-#
-# CONFIG_QCOM_BAM_DMA is not set
+# CONFIG_SUDMAC is not set
 
 #
 # Speakup console speech
@@ -1219,6 +1218,7 @@ 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_COMMON_CLK_QCOM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
@@ -1298,9 +1298,14 @@ CONFIG_RPMSG=m
 #
 # SOC (System On Chip) specific Drivers
 #
+# 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_SMD=m
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_SMEM=m
 CONFIG_SUNXI_SRAM=y
 # CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set
 CONFIG_KEYSTONE_NAVIGATOR_DMA=m
@@ -1314,6 +1319,7 @@ CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 # CONFIG_TI_AEMIF is not set
 # CONFIG_TI_EMIF is not set
 CONFIG_OMAP_GPMC=y
+# CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_TEGRA20_MC=y
 CONFIG_TEGRA_MC=y
 CONFIG_TEGRA124_EMC=y
@@ -1371,7 +1377,6 @@ CONFIG_TWL4030_USB=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
 CONFIG_PHY_EXYNOS5250_SATA=m
 CONFIG_PHY_HIX5HD2_SATA=m
-CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_EXYNOS4210_USB2=y
 CONFIG_PHY_EXYNOS4X12_USB2=y
@@ -1385,10 +1390,22 @@ CONFIG_PHY_STIH41X_USB=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_BRCMSTB_SATA=m
 
+#
+# Performance monitor support
+#
+CONFIG_ARM_PMU=y
+
+#
+# Android
+#
+CONFIG_QCOM_QFPROM=m
+CONFIG_NVMEM_SUNXI_SID=m
+
 #
 # Firmware Drivers
 #
 CONFIG_QCOM_SCM=y
+CONFIG_QCOM_SCM_32=y
 CONFIG_BCM47XX_NVRAM=y
 
 #
@@ -1427,6 +1444,18 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 #
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_LE=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
@@ -1434,6 +1463,11 @@ CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_UX500 is not set
 CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+
+#
+# Certificates for signature checking
+#
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_SHA1_ARM_NEON=m

diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index 5d84e7cffca11763740ef588602bf174abcd3d4b..b97dd842ca82033bc2b22fd0798d15e3600084b4 100644 (file)
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -2,9 +2,9 @@ CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_FIX_EARLYCON_MEM=y
 
 #
 # RCU Subsystem
@@ -32,11 +32,14 @@ CONFIG_PREEMPT_NOTIFIERS=y
 #
 # Platform selection
 #
+# 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_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_TEGRA is not set
 # CONFIG_ARCH_SPRD is not set
@@ -54,6 +57,7 @@ CONFIG_PCI_LABEL=y
 # PCI host controller drivers
 #
 CONFIG_PCI_XGENE=y
+# CONFIG_PCIE_IPROC is not set
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
@@ -69,6 +73,7 @@ CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
+CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 # CONFIG_ARM64_4K_PAGES is not set
@@ -98,6 +103,13 @@ CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 
+#
+# ARMv8.1 architectural features
+#
+CONFIG_ARM64_HW_AFDBM=y
+CONFIG_ARM64_PAN=y
+CONFIG_ARM64_LSE_ATOMICS=y
+
 #
 # Boot options
 #
@@ -177,6 +189,16 @@ CONFIG_THUNDER_NIC_BGX=m
 CONFIG_LIQUIDIO=m
 CONFIG_NET_SB1000=m
 
+#
+# MII PHY device drivers
+#
+CONFIG_MDIO_OCTEON=m
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_FUJITSU_ES is not set
+
 #
 # Input device support
 #
@@ -292,7 +314,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 
 #
-# Platform Glue Layer
+# MUSB DMA mode
 #
 CONFIG_MUSB_PIO_ONLY=y
 
@@ -329,8 +351,8 @@ CONFIG_RTC_DRV_XGENE=m
 # DMA Devices
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
-CONFIG_XGENE_DMA=m
 CONFIG_DMA_ACPI=y
+CONFIG_XGENE_DMA=m
 
 #
 # DMA Clients
@@ -390,6 +412,7 @@ CONFIG_PHY_XGENE=m
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
 CONFIG_ND_BTT=m
 CONFIG_BTT=y
 
@@ -424,7 +447,6 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
-CONFIG_ACPI_NFIT=m
 # CONFIG_PMIC_OPREGION is not set
 
 #
@@ -444,7 +466,6 @@ CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_KVM_COMPAT=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
-CONFIG_KVM_ARM_MAX_VCPUS=4
 
 #
 # Compile-time checks and compiler options
@@ -469,6 +490,10 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+
+#
+# Certificates for signature checking
+#
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=m
 CONFIG_CRYPTO_SHA2_ARM64_CE=m

diff --git a/kernel/config-generic b/kernel/config-generic
index 936e462b7263bd5797f122659c2143194d1ab4d3..1ab2414deeae8e3c6547235a5ed5b2fe8817dfa8 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -5,11 +5,13 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_MMU=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -80,8 +82,6 @@ CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_TREE_RCU_TRACE is not set
-CONFIG_RCU_NOCB_CPU=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_BUILD_BIN2C is not set
 # CONFIG_IKCONFIG is not set
@@ -90,6 +90,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
@@ -146,7 +147,9 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_USERFAULTFD is not set
 CONFIG_PCI_QUIRKS=y
+CONFIG_MEMBARRIER=y
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 
@@ -162,10 +165,11 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
 # CONFIG_PROFILING is not set
 CONFIG_TRACEPOINTS=y
 CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
 # CONFIG_UPROBES is not set
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -269,6 +273,8 @@ CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 # CONFIG_XEN is not set
 CONFIG_NO_BOOTMEM=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT_NONE=y
@@ -296,6 +302,8 @@ CONFIG_CMA_AREAS=7
 CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 # CONFIG_ZSMALLOC is not set
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_FRAME_VECTOR=y
 CONFIG_SECCOMP=y
 CONFIG_HOTPLUG_CPU=y
 
@@ -304,6 +312,7 @@ CONFIG_HOTPLUG_CPU=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
@@ -422,7 +431,6 @@ CONFIG_NET_IPVTI=m
 CONFIG_NET_UDP_TUNNEL=m
 CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
-# CONFIG_GENEVE_CORE is not set
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -462,6 +470,7 @@ CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -673,6 +682,7 @@ CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
 CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
@@ -701,7 +711,9 @@ CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
 CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
@@ -727,6 +739,8 @@ CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
@@ -891,6 +905,7 @@ CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
 # CONFIG_HSR is not set
 CONFIG_NET_SWITCHDEV=y
 CONFIG_RPS=y
@@ -919,6 +934,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
 CONFIG_BT_LE=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BT_DEBUGFS is not set
@@ -929,6 +945,7 @@ CONFIG_BT_LE=y
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -940,6 +957,7 @@ CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -991,6 +1009,7 @@ CONFIG_RFKILL_INPUT=y
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
+CONFIG_LWTUNNEL=y
 
 #
 # Device Drivers
@@ -1126,6 +1145,7 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_KERNEL_API is not set
+# CONFIG_CXL_EEH is not set
 
 #
 # SCSI device support
@@ -1402,6 +1422,7 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
+# CONFIG_GENEVE is not set
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
@@ -1411,6 +1432,7 @@ CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
+CONFIG_NET_VRF=m
 CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
 CONFIG_ATM_DRIVERS=y
@@ -1469,10 +1491,11 @@ CONFIG_BNX2=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=m
 CONFIG_BNX2X=m
+CONFIG_BNX2X_VXLAN=y
 CONFIG_SYSTEMPORT=m
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
-CONFIG_NET_VENDOR_CAVIUM=m
+CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1531,6 +1554,9 @@ CONFIG_MLX4_EN_VXLAN=y
 CONFIG_MLX4_CORE=m
 # CONFIG_MLX4_DEBUG is not set
 # CONFIG_MLX5_CORE is not set
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_SWITCHX2=m
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851_MLL is not set
@@ -1600,6 +1626,8 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_SYNOPSYS_DWC_ETH_QOS=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
@@ -1621,6 +1649,7 @@ CONFIG_PHYLIB=y
 #
 # MII PHY device drivers
 #
+CONFIG_AQUANTIA_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_MARVELL_PHY=m
@@ -1629,6 +1658,7 @@ CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
+CONFIG_TERANETICS_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
 CONFIG_BCM7XXX_PHY=m
@@ -1639,7 +1669,9 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
+CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
+CONFIG_MICROCHIP_PHY=m
 CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_GPIO is not set
@@ -1667,6 +1699,7 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=m
@@ -1701,6 +1734,7 @@ CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
 CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
@@ -2068,7 +2102,6 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
-# CONFIG_INPUT_MAX77843_HAPTIC is not set
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_MPU3050 is not set
@@ -2158,6 +2191,7 @@ CONFIG_SERIAL_8250_DW=m
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_SC16IS7XX_CORE=m
@@ -2204,6 +2238,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -2237,6 +2272,7 @@ CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
+CONFIG_I2C_EMEV2=m
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_KEMPLD=m
 # CONFIG_I2C_OCORES is not set
@@ -2497,6 +2533,7 @@ CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_LM25066=m
 # CONFIG_SENSORS_LTC2978 is not set
 CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_TPS40422=m
@@ -2567,10 +2604,6 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CLOCK_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 CONFIG_IMX_THERMAL=m
-
-#
-# Texas Instruments thermal drivers
-#
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
@@ -2583,6 +2616,7 @@ CONFIG_SOFT_WATCHDOG=m
 CONFIG_DA9052_WATCHDOG=m
 CONFIG_DA9055_WATCHDOG=m
 CONFIG_DA9063_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
 CONFIG_GPIO_WATCHDOG=m
 CONFIG_MENF21BMC_WATCHDOG=m
 CONFIG_WM831X_WATCHDOG=m
@@ -2650,11 +2684,11 @@ CONFIG_PMIC_ADP5520=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_AXP20X=y
-# CONFIG_MFD_CROS_EC is not set
 CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
 CONFIG_MFD_DA9063=y
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
@@ -2745,6 +2779,7 @@ CONFIG_REGULATOR_BCM590XX=m
 CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
 CONFIG_REGULATOR_DA9063=m
 CONFIG_REGULATOR_DA9210=m
 CONFIG_REGULATOR_DA9211=m
@@ -2769,7 +2804,7 @@ CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MAX77686=m
 CONFIG_REGULATOR_MAX77693=m
 CONFIG_REGULATOR_MAX77802=m
-CONFIG_REGULATOR_MAX77843=m
+CONFIG_REGULATOR_MT6311=m
 CONFIG_REGULATOR_MT6397=m
 CONFIG_REGULATOR_PALMAS=m
 CONFIG_REGULATOR_PFUZE100=m
@@ -3018,6 +3053,8 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 # Media capture support
 #
+# CONFIG_VIDEO_SOLO6X10 is not set
+# CONFIG_VIDEO_TW68 is not set
 
 #
 # Media capture/analog TV support
@@ -3026,8 +3063,6 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_SOLO6X10 is not set
-# CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_DT3155 is not set
 
 #
@@ -3048,6 +3083,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 CONFIG_VIDEO_SH_VEU=m
 # CONFIG_V4L_TEST_DRIVERS is not set
+CONFIG_DVB_PLATFORM_DRIVERS=y
 
 #
 # Supported MMC/SDIO adapters
@@ -3299,14 +3335,11 @@ CONFIG_DVB_AF9033=m
 #
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
-
-#
-# Direct Rendering Manager
-#
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
+# CONFIG_DRM_FBDEV_EMULATION is not set
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
 
@@ -3316,8 +3349,6 @@ CONFIG_DRM_TTM=m
 # CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
-CONFIG_DRM_PTN3460=m
-CONFIG_DRM_PS8622=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
@@ -3334,8 +3365,6 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VMWGFX=m
-# CONFIG_DRM_VMWGFX_FBCON is not set
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
@@ -3349,8 +3378,15 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_S6E8AA0=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
 
 #
 # Frame buffer Devices
@@ -3416,6 +3452,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -3424,6 +3461,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_DA903X is not set
 # CONFIG_BACKLIGHT_DA9052 is not set
 # CONFIG_BACKLIGHT_MAX8925 is not set
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
 # CONFIG_BACKLIGHT_WM831X is not set
 # CONFIG_BACKLIGHT_ADP5520 is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -3631,6 +3669,7 @@ CONFIG_HID_CYPRESS=y
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_ELO is not set
 CONFIG_HID_EZKEY=y
+# CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_HOLTEK is not set
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
@@ -3795,6 +3834,10 @@ CONFIG_USB_MUSB_HOST=y
 #
 # Platform Glue Layer
 #
+
+#
+# MUSB DMA mode
+#
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_DWC3_HOST=y
@@ -3803,11 +3846,6 @@ CONFIG_USB_DWC3_HOST=y
 # Platform Glue Driver Support
 #
 CONFIG_USB_DWC3_PCI=m
-
-#
-# Debugging features
-#
-# CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC2_HOST=y
 
@@ -3944,9 +3982,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_MMC_SDHCI_OF_AT91=m
 CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_CB710=m
@@ -4020,7 +4060,6 @@ CONFIG_LEDS_KTD2692=m
 #
 CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_PM8941_WLED=m
 
 #
 # LED Triggers
@@ -4142,6 +4181,7 @@ CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_WM831X=m
 CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_ZYNQMP=m
 
 #
 # on-CPU RTC drivers
@@ -4159,12 +4199,13 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
-CONFIG_HSU_DMA=m
-CONFIG_HSU_DMA_PCI=m
-CONFIG_FSL_EDMA=m
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
+CONFIG_FSL_EDMA=m
+CONFIG_IDMA64=m
+CONFIG_HSU_DMA=m
+CONFIG_HSU_DMA_PCI=m
 
 #
 # DMA Clients
@@ -4279,7 +4320,6 @@ CONFIG_SENSORS_HMC5843_I2C=m
 #
 # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
 # CONFIG_FT1000 is not set
@@ -4295,13 +4335,21 @@ CONFIG_SENSORS_HMC5843_I2C=m
 # Android
 #
 # CONFIG_STAGING_BOARD is not set
-# CONFIG_USB_WPAN_HCD 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_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4386,8 +4434,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_BMC150_ACCEL is not set
 # CONFIG_HID_SENSOR_ACCEL_3D is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_MMA8452 is not set
 CONFIG_KXCJK1013=m
+# CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_STK8312 is not set
@@ -4486,8 +4534,11 @@ CONFIG_CM32181=m
 # CONFIG_HID_SENSOR_ALS is not set
 # CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
 # CONFIG_SENSORS_LM3533 is not set
 # CONFIG_LTR501 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
 # CONFIG_STK3310 is not set
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
@@ -4562,6 +4613,10 @@ CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_PHY_TUSB1210=m
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
 CONFIG_RAS=y
 CONFIG_THUNDERBOLT=m
 
@@ -4569,6 +4624,7 @@ CONFIG_THUNDERBOLT=m
 # Android
 #
 # CONFIG_ANDROID is not set
+CONFIG_NVMEM=m
 
 #
 # Firmware Drivers
@@ -4585,7 +4641,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=m
@@ -4849,7 +4905,7 @@ CONFIG_DEBUG_KERNEL=y
 #
 # Memory Debugging
 #
-# CONFIG_PAGE_EXTENSION is not set
+CONFIG_PAGE_EXTENSION=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_STATS is not set
@@ -4907,7 +4963,6 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -4971,6 +5026,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_MEMTEST is not set
+# CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
@@ -5044,6 +5100,7 @@ CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
@@ -5154,6 +5211,12 @@ CONFIG_PUBLIC_KEY_ALGO_RSA=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=m
 # CONFIG_PKCS7_TEST_KEY is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
 CONFIG_VIRTUALIZATION=y
 CONFIG_BINARY_PRINTF=y
 
@@ -5168,7 +5231,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
-CONFIG_PERCPU_RWSEM=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -5223,7 +5285,6 @@ CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_AVERAGE=y
 CONFIG_CLZ_TAB=y
 CONFIG_CORDIC=m
 # CONFIG_DDR is not set
@@ -5234,4 +5295,5 @@ CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
+# CONFIG_SG_SPLIT is not set
 CONFIG_ARCH_HAS_SG_CHAIN=y

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index c54e3ee0838aa77cf6906a503e3dd7aee8930bad..adc0cc37f08d1e97a278e1ab0208d9f774bf506e 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -72,8 +72,7 @@ CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 # CONFIG_X86_ANCIENT_MCE is not set
-CONFIG_VM86=y
-CONFIG_X86_ESPFIX32=y
+# CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_TOSHIBA=m
 # CONFIG_X86_REBOOTFIXUPS is not set
 # CONFIG_NOHIGHMEM is not set
@@ -94,7 +93,6 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HIGHPTE=y
-# CONFIG_MATH_EMULATION is not set
 CONFIG_PHYSICAL_START=0x400000
 CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -369,6 +367,10 @@ CONFIG_CRYPTO_TWOFISH_586=m
 # Random Number Generation
 #
 CONFIG_CRYPTO_DEV_GEODE=m
+
+#
+# Certificates for signature checking
+#
 # CONFIG_LGUEST is not set
 
 #

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index b6253f5ce34963d4a3ec7ef11978baf7e412ef4a..328bad8d64f3ed39127d4561ee17a8b4e3440132 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -142,6 +142,7 @@ CONFIG_COMMON_CLK_PWM=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_CRC=y
 CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_LP3943=m
 CONFIG_PWM_LPSS=m

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index c448f571883151ca984136b66052756f1e58a357..6a652ea46940a83b0b15bdac9c68628fbaf45a2a 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -2,7 +2,6 @@ CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -13,7 +12,6 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
 
 #
 # General setup
@@ -40,8 +38,7 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 #
 # RCU Subsystem
 #
-# CONFIG_RCU_NOCB_CPU_NONE is not set
-CONFIG_RCU_NOCB_CPU_ALL=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_PCSPKR_PLATFORM=y
 
@@ -110,7 +107,7 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_X86_16BIT=y
+# CONFIG_VM86 is not set
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
@@ -136,6 +133,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
 CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -166,6 +164,7 @@ CONFIG_X86_NEED_RELOCS=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
+# CONFIG_MODIFY_LDT_SYSCALL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
@@ -186,6 +185,8 @@ CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
@@ -453,15 +454,12 @@ CONFIG_TULIP_NAPI=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
 CONFIG_DE4X5=m
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_IGB_DCA=y
-CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E_VXLAN=y
 CONFIG_I40EVF=m
 CONFIG_FM10K=m
 CONFIG_FM10K_VXLAN=y
 CONFIG_SKGE_GENESIS=y
-CONFIG_MYRI10GE_DCA=y
 CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_VXLAN=y
 CONFIG_ATP=m
@@ -484,6 +482,11 @@ CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_FUJITSU_ES is not set
+
 #
 # HiSax supported cards
 #
@@ -694,6 +697,7 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INTEL_PCH_THERMAL=m
 
 #
 # Watchdog Device Drivers
@@ -739,8 +743,12 @@ CONFIG_WDTPCI=m
 # Multifunction device drivers
 #
 CONFIG_MFD_ATMEL_HLCDC=m
+# CONFIG_MFD_CROS_EC is not set
 CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
 CONFIG_MFD_RTSX_PCI=m
 # CONFIG_ABX500_CORE is not set
 
@@ -784,10 +792,6 @@ CONFIG_DVB_TTUSB_DEC=m
 # Media capture support
 #
 CONFIG_VIDEO_MEYE=m
-
-#
-# Media capture/analog TV support
-#
 # CONFIG_VIDEO_ZORAN is not set
 
 #
@@ -918,10 +922,10 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_SIS=m
+CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX_FBCON is not set
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
@@ -970,7 +974,7 @@ CONFIG_SND_USB_US122L=m
 # CONFIG_SND_SOC is not set
 
 #
-# Platform Glue Layer
+# MUSB DMA mode
 #
 CONFIG_MUSB_PIO_ONLY=y
 
@@ -1009,7 +1013,6 @@ CONFIG_EDAC=y
 # CONFIG_EDAC_LEGACY_SYSFS is not set
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
@@ -1033,17 +1036,14 @@ CONFIG_RTC_DRV_CMOS=y
 #
 # DMA Devices
 #
-CONFIG_INTEL_IOATDMA=m
+CONFIG_DMA_ACPI=y
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-CONFIG_DMA_ACPI=y
 
 #
 # DMA Clients
 #
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DCA=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
@@ -1113,6 +1113,7 @@ CONFIG_SAMSUNG_Q10=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=m
+# CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
@@ -1169,12 +1170,18 @@ CONFIG_TWL6030_GPADC=m
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
 # CONFIG_PHY_EXYNOS5250_USB2 is not set
 
+#
+# Performance monitor support
+#
+# CONFIG_AMD_MCE_INJ is not set
+
 #
 # Android
 #
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
 CONFIG_ND_BTT=m
 CONFIG_BTT=y
 
@@ -1320,6 +1327,11 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_QAT=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+
+#
+# Certificates for signature checking
+#
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
@@ -1340,4 +1352,4 @@ CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_UCS2_STRING=y
-CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_MMIO_FLUSH=y

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index 0b938ac6de8bb1201b4d7c56a9fd75540c0a12ea..47c7290ab1b34c85bc4898ad190901fb0668dadb 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -27,8 +27,11 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING=y
-CONFIG_RCU_USER_QS=y
 CONFIG_CONTEXT_TRACKING_FORCE=y
+CONFIG_RCU_NOCB_CPU=y
+# CONFIG_RCU_NOCB_CPU_NONE is not set
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_NUMA_BALANCING is not set
@@ -59,10 +62,7 @@ CONFIG_GENERIC_CPU=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
 # CONFIG_MAXSMP is not set
-CONFIG_X86_ESPFIX64=y
 CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_X86_DIRECT_GBPAGES=y
 CONFIG_NUMA=y
@@ -83,6 +83,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_MOVABLE_NODE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
 # CONFIG_EFI_MIXED is not set
+# CONFIG_KEXEC_FILE is not set
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -168,6 +169,14 @@ CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
 CONFIG_LIQUIDIO=m
+CONFIG_IGB_DCA=y
+CONFIG_IXGBE_DCA=y
+CONFIG_MYRI10GE_DCA=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MDIO_OCTEON=m
 
 #
 # Input Device Drivers
@@ -199,7 +208,7 @@ CONFIG_POWER_RESET_AS3722=y
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
 #
-# Display Panels
+# Display Interface Bridges
 #
 CONFIG_HSA_AMD=m
 
@@ -211,8 +220,15 @@ CONFIG_EDAC_SBRIDGE=m
 #
 # DMA Devices
 #
+CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_MIC_X100_DMA=m
 
+#
+# DMA Clients
+#
+CONFIG_DMA_ENGINE_RAID=y
+CONFIG_DCA=m
+
 #
 # Android
 #
@@ -252,6 +268,7 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=y
 # Digest
 #
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
@@ -270,6 +287,7 @@ CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
@@ -278,7 +296,7 @@ CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
 #
-# Random Number Generation
+# Certificates for signature checking
 #
 CONFIG_KVM_COMPAT=y
 
@@ -286,3 +304,4 @@ CONFIG_KVM_COMPAT=y
 # Library routines
 #
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_PMEM_API=y

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 22fecdc213cdf7105462c36a580f529af2a924c5..ed1f2d0c42e5872e9b3165667362e2514d27e2b4 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.2.7
+version    = 4.3.6
 release    = 1
 thisapp    = linux-%{version}
 
@@ -35,7 +35,7 @@ build
                asciidoc
                audit-devel
                bc
-               binutils >= 2.23.51.0.3-3
+               binutils >= 2.25
                binutils-devel
                bison
                elfutils-devel
@@ -43,6 +43,7 @@ build
                gcc >= 4.9
                gcc-plugin-devel
                gettext
+               hostname
                libunwind-devel
                ncurses-devel
                net-tools
@@ -50,6 +51,7 @@ build
                pciutils-devel
                perl
                python-devel
+               openssl-devel
                slang-devel
                xmlto
                xz