From 0b77b019cf2ab572615f7eda8c5d192c331d1085 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 20 Sep 2018 15:38:26 +0100
Subject: [PATCH] kernel: Update to 4.16.18

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 kernel/config-arm-generic   |  19 +++--
 kernel/config-arm32-generic |  66 +++++++++++-----
 kernel/config-arm64-generic |  30 +++++---
 kernel/config-generic       | 150 +++++++++++++++++++-----------------
 kernel/config-x86-generic   |  58 +++++++++-----
 kernel/kernel.nm            |   2 +-
 6 files changed, 196 insertions(+), 129 deletions(-)

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index db89f3c4a..0cd12ae5d 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -84,8 +84,8 @@ CONFIG_CPU_PM=y
 # CPU frequency scaling drivers
 #
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
-# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_SCPI_CPUFREQ=m
+# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_QORIQ_CPUFREQ=m
 
 #
@@ -196,6 +196,7 @@ CONFIG_HNS_DSAF=m
 CONFIG_HNS_ENET=m
 CONFIG_HNS3=m
 CONFIG_HNS3_HCLGE=m
+CONFIG_HNS3_HCLGEVF=m
 # CONFIG_SKGE_GENESIS is not set
 CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_8129 is not set
@@ -341,7 +342,6 @@ CONFIG_MESON_WATCHDOG=m
 # Multifunction device drivers
 #
 # CONFIG_LPC_ICH is not set
-# CONFIG_MFD_RTSX_PCI is not set
 
 #
 # STMicroelectronics STMPE Interface Drivers
@@ -354,7 +354,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_VEXPRESS=m
 # CONFIG_IR_MESON is not set
-# CONFIG_IR_PWM_TX is not set
 
 #
 # Multimedia core support
@@ -448,9 +447,6 @@ CONFIG_DRM_PL111=m
 # Console display driver support
 #
 CONFIG_SND_DMAENGINE_PCM=m
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ES1968_INPUT is not set
-# CONFIG_SND_MAESTRO3_INPUT is not set
 
 #
 # HD-Audio
@@ -526,12 +522,15 @@ CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_MAX98504=m
 CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX9860=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_PCM1681=m
 CONFIG_SND_SOC_PCM179X=m
 CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
 CONFIG_SND_SOC_PCM3168A=m
 CONFIG_SND_SOC_PCM3168A_I2C=m
 CONFIG_SND_SOC_PCM512x=m
@@ -558,12 +557,16 @@ CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS5086=m
 CONFIG_SND_SOC_TAS571X=m
 CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
 CONFIG_SND_SOC_TFA9879=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8524=m
@@ -762,10 +765,6 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=m
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_FTRACE_SYSCALLS is not set
-
-#
-# Runtime Testing
-#
 # CONFIG_PID_IN_CONTEXTIDR is not set
 # CONFIG_CORESIGHT is not set
 
diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 35b003606..346b4b353 100644
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -6,6 +6,7 @@ CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_NO_IOPORT_MAP=y
 CONFIG_ARCH_HAS_BANDGAP=y
+CONFIG_ZONE_DMA=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 
 #
@@ -35,6 +36,7 @@ CONFIG_ARCH_MMAP_RND_BITS=16
 CONFIG_OLD_SIGACTION=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 
 #
 # GCOV-based kernel profiling
@@ -306,6 +308,7 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_CACHE_B15_RAC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
 # CONFIG_CACHE_L2X0_PMU is not set
@@ -356,8 +359,6 @@ CONFIG_PCIE_IPROC=m
 CONFIG_PCIE_IPROC_PLATFORM=m
 # CONFIG_PCIE_IPROC_BCMA is not set
 CONFIG_PCIE_IPROC_MSI=y
-CONFIG_PCIE_ALTERA=y
-# CONFIG_PCIE_ALTERA_MSI is not set
 # CONFIG_PCIE_ROCKCHIP is not set
 # CONFIG_PCIE_MEDIATEK is not set
 
@@ -391,7 +392,6 @@ CONFIG_HZ_100=y
 CONFIG_HZ=100
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
-CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -404,6 +404,7 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_BOUNCE=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -428,10 +429,9 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU frequency scaling drivers
 #
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
-# CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG is not set
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
@@ -662,6 +662,7 @@ CONFIG_HW_RANDOM_HISI=y
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_ST=m
 CONFIG_HW_RANDOM_MTK=y
+CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_NVRAM=y
 
 #
@@ -759,6 +760,7 @@ CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8994=m
 CONFIG_PINCTRL_MSM8996=m
+CONFIG_PINCTRL_MSM8998=m
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_SAMSUNG=y
@@ -791,6 +793,10 @@ CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
 CONFIG_PINCTRL_TI_IODELAY=y
 # CONFIG_PINCTRL_WM8850 is not set
+
+#
+# MediaTek pinctrl drivers
+#
 CONFIG_PINCTRL_MTK=y
 # CONFIG_PINCTRL_MT2701 is not set
 CONFIG_PINCTRL_MT8135=y
@@ -831,7 +837,6 @@ CONFIG_GPIO_TS4900=m
 # CONFIG_ROCKCHIP_IODOMAIN is not set
 CONFIG_POWER_RESET_BRCMKONA=y
 CONFIG_POWER_RESET_HISI=y
-CONFIG_POWER_RESET_IMX=y
 # CONFIG_POWER_RESET_MSM is not set
 CONFIG_POWER_RESET_ST=y
 CONFIG_POWER_RESET_VERSATILE=y
@@ -888,6 +893,7 @@ CONFIG_QCOM_TSENS=m
 #
 # Watchdog Device Drivers
 #
+CONFIG_FTWDT010_WATCHDOG=m
 CONFIG_S3C2410_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_DAVINCI_WATCHDOG=m
@@ -904,7 +910,7 @@ CONFIG_BCM47XX_WDT=m
 CONFIG_BCM7038_WDT=m
 
 #
-# Sonics Silicon Backplane
+# Watchdog Pretimeout Governors
 #
 CONFIG_SSB_HOST_SOC=y
 
@@ -1022,9 +1028,6 @@ CONFIG_DRM_EXYNOS_MIC=y
 #
 # Sub-drivers
 #
-CONFIG_DRM_EXYNOS_IPP=y
-# CONFIG_DRM_EXYNOS_FIMC is not set
-# CONFIG_DRM_EXYNOS_ROTATOR is not set
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
@@ -1097,6 +1100,7 @@ CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_DRM_TVE200 is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
 # Frame buffer hardware drivers
@@ -1110,6 +1114,24 @@ CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_FB_MX3 is not set
 # CONFIG_FB_MXS is not set
 
+#
+# Console display driver support
+#
+CONFIG_SND_ALS300=m
+# CONFIG_SND_ALI5451 is not set
+CONFIG_SND_AZT3328=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+# CONFIG_SND_ES1968_INPUT is not set
+CONFIG_SND_ICE1712=m
+CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_MAESTRO3_INPUT is not set
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+
 #
 # HD-Audio
 #
@@ -1197,6 +1219,7 @@ CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_WM8994=m
+CONFIG_SND_SYNTH_EMUX=m
 
 #
 # USB Host Controller Drivers
@@ -1315,6 +1338,7 @@ CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
 CONFIG_RTC_DRV_SIRFSOC=m
 CONFIG_RTC_DRV_ST_LPC=m
 CONFIG_RTC_DRV_MT7622=m
@@ -1350,6 +1374,7 @@ CONFIG_ST_FDMA=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_CHROME_PLATFORMS=y
+# CONFIG_MELLANOX_PLATFORM is not set
 
 #
 # Common Clock Framework
@@ -1369,8 +1394,13 @@ CONFIG_COMMON_CLK_HI3798CV200=y
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_RESET_HISI=y
 CONFIG_STUB_CLK_HI6220=y
+CONFIG_STUB_CLK_HI3660=y
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_TI_SCI_CLK=m
+
+#
+# Clock driver for MediaTek SoC
+#
 CONFIG_COMMON_CLK_MEDIATEK=y
 CONFIG_COMMON_CLK_MT2701=y
 # CONFIG_COMMON_CLK_MT2701_MMSYS is not set
@@ -1388,6 +1418,7 @@ CONFIG_COMMON_CLK_MT8173=y
 CONFIG_COMMON_CLK_MESON8B=y
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=m
+CONFIG_QCOM_A53PLL=m
 # CONFIG_QCOM_CLK_RPM is not set
 # CONFIG_QCOM_CLK_SMD_RPM is not set
 CONFIG_APQ_GCC_8084=m
@@ -1408,6 +1439,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_GCC_8994=m
 CONFIG_MSM_GCC_8996=m
 CONFIG_MSM_MMCC_8996=m
+CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
 CONFIG_SUNXI_CCU=y
@@ -1572,6 +1604,7 @@ CONFIG_EXTCON_QCOM_SPMI_MISC=m
 # CONFIG_TI_EMIF is not set
 CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
+CONFIG_TI_EMIF_SRAM=m
 CONFIG_TEGRA20_MC=y
 CONFIG_MTK_SMI=y
 CONFIG_SAMSUNG_MC=y
@@ -1690,10 +1723,6 @@ CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_VF610_OCOTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
-
-#
-# FSI support
-#
 # CONFIG_TEE is not set
 
 #
@@ -1733,11 +1762,9 @@ CONFIG_PROC_VMCORE=y
 #
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-
-#
-# Runtime Testing
-#
-# CONFIG_ARM_PTDUMP is not set
+CONFIG_ARM_PTDUMP_CORE=y
+# CONFIG_ARM_PTDUMP_DEBUGFS is not set
+CONFIG_DEBUG_WX=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
@@ -1803,3 +1830,4 @@ CONFIG_CRYPTO_CRC32_ARM_CE=m
 #
 CONFIG_STMP_DEVICE=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+# CONFIG_DMA_DIRECT_OPS is not set
diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index e49a4d2bd..0fcf0c4f0 100644
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -10,6 +10,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CSUM=y
+CONFIG_ZONE_DMA32=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -26,6 +27,7 @@ CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 # CONFIG_NUMA_BALANCING is not set
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 
 #
 # Kernel Performance Events And Counters
@@ -140,6 +142,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -157,6 +160,9 @@ 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_ARM64_PA_BITS_48=y
+# CONFIG_ARM64_PA_BITS_52 is not set
+CONFIG_ARM64_PA_BITS=48
 CONFIG_NR_CPUS=64
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=2
@@ -183,6 +189,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
@@ -206,6 +213,7 @@ CONFIG_ARM64_VHE=y
 #
 CONFIG_ARM64_UAO=y
 # CONFIG_ARM64_PMEM is not set
+CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 CONFIG_ARM64_MODULE_PLTS=y
@@ -237,8 +245,8 @@ CONFIG_SYSVIPC_COMPAT=y
 #
 # CPU frequency scaling drivers
 #
-CONFIG_ARM_DT_BL_CPUFREQ=m
 CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ARM_DT_BL_CPUFREQ=m
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
@@ -299,6 +307,7 @@ CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
 CONFIG_LIQUIDIO=m
 CONFIG_LIQUIDIO_VF=m
 CONFIG_HNS3_ENET=m
@@ -386,6 +395,8 @@ CONFIG_PINCTRL_SINGLE=m
 CONFIG_PINCTRL_PALMAS=m
 CONFIG_PINCTRL_MESON_GXBB=y
 CONFIG_PINCTRL_MESON_GXL=y
+CONFIG_PINCTRL_MESON_AXG=y
+CONFIG_PINCTRL_MESON_AXG_PMX=y
 CONFIG_GPIO_ACPI=y
 
 #
@@ -449,6 +460,7 @@ CONFIG_REGULATOR_HI6421V530=m
 #
 CONFIG_DRM_HISI_KIRIN=m
 CONFIG_HISI_KIRIN_DW_DSI=m
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
 # Frame buffer hardware drivers
@@ -460,6 +472,7 @@ CONFIG_FB_EFI=y
 #
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
+# CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_LX6464ES is not set
 
 #
@@ -535,6 +548,7 @@ CONFIG_IRQ_BYPASS_MANAGER=y
 #
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_GXBB=y
+CONFIG_COMMON_CLK_AXG=y
 
 #
 # Clock Source drivers
@@ -600,6 +614,7 @@ CONFIG_PHY_XGENE=m
 # Performance monitor support
 #
 CONFIG_ARM_PMU_ACPI=y
+# CONFIG_ARM_DSU_PMU is not set
 # CONFIG_HISI_PMU is not set
 CONFIG_XGENE_PMU=y
 # CONFIG_ARM_SPE_PMU is not set
@@ -613,10 +628,6 @@ CONFIG_ND_BLK=m
 CONFIG_ND_CLAIM=y
 CONFIG_ND_BTT=m
 CONFIG_BTT=y
-
-#
-# FSI support
-#
 CONFIG_TEE=m
 
 #
@@ -634,6 +645,7 @@ CONFIG_MUX_MMIO=m
 #
 # Firmware Drivers
 #
+# CONFIG_ARM_SDE_INTERFACE is not set
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
 CONFIG_FW_CFG_SYSFS=m
@@ -731,10 +743,6 @@ CONFIG_ARCH_HAS_KCOV=y
 #
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_HIST_TRIGGERS is not set
-
-#
-# Runtime Testing
-#
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_ARM64_PTDUMP_CORE is not set
 # CONFIG_ARM64_PTDUMP_DEBUGFS is not set
@@ -771,6 +779,9 @@ CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA1_ARM64_CE=m
 CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+# CONFIG_CRYPTO_SM3_ARM64_CE is not set
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM64_CE=m
@@ -786,4 +797,5 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
 #
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_HAS_IOPORT_MAP=y
+CONFIG_DMA_DIRECT_OPS=y
 CONFIG_UCS2_STRING=y
diff --git a/kernel/config-generic b/kernel/config-generic
index eeb95ee27..0c8fdf6ab 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -13,7 +13,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
@@ -48,7 +47,6 @@ CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -207,6 +205,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -226,10 +225,10 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
 CONFIG_GCC_PLUGIN_RANDSTRUCT=y
 CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y
 CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 CONFIG_CC_STACKPROTECTOR_STRONG=y
+# CONFIG_CC_STACKPROTECTOR_AUTO is not set
 CONFIG_THIN_ARCHIVES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -335,7 +334,6 @@ CONFIG_FREEZER=y
 #
 # Processor type and features
 #
-CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 # CONFIG_GOLDFISH is not set
 # CONFIG_XEN is not set
@@ -359,7 +357,6 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
-CONFIG_BOUNCE=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
@@ -464,6 +461,12 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 
+#
+# Cadence PCIe controllers support
+#
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+
 #
 # DesignWare PCI Core Support
 #
@@ -623,12 +626,15 @@ CONFIG_BRIDGE_NETFILTER=y
 #
 CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_LOG_COMMON=m
 CONFIG_NF_LOG_NETDEV=m
+CONFIG_NETFILTER_CONNCOUNT=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_PROCFS=y
@@ -674,6 +680,7 @@ CONFIG_NFT_META=m
 CONFIG_NFT_RT=m
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_SET_RBTREE=m
 CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_SET_BITMAP=m
@@ -696,6 +703,8 @@ CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=y
 
 #
@@ -848,6 +857,7 @@ CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
@@ -874,17 +884,18 @@ CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
 # CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
@@ -940,13 +951,13 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_LAN9303=y
 CONFIG_NET_DSA_TAG_MTK=y
-CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
@@ -954,7 +965,6 @@ CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=y
 # CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
@@ -1106,6 +1116,7 @@ CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
 CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIUART=m
@@ -1194,7 +1205,6 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_WANT_DEV_COREDUMP=y
@@ -1211,7 +1221,6 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_HWSPINLOCK=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 
@@ -1227,12 +1236,9 @@ CONFIG_OF=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
 # CONFIG_OF_OVERLAY is not set
 
 #
@@ -1288,6 +1294,7 @@ CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_DS1682=m
 CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_MISC_RTSX=m
 # CONFIG_C2PORT is not set
 
 #
@@ -1348,6 +1355,9 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_LIB is not set
+# CONFIG_OCXL_BASE is not set
+# CONFIG_MISC_RTSX_PCI is not set
+CONFIG_MISC_RTSX_USB=m
 
 #
 # SCSI device support
@@ -1482,6 +1492,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_QORIQ=m
@@ -1590,6 +1601,7 @@ CONFIG_DM_BUFIO=y
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_UNSTRIPED is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=m
@@ -1669,7 +1681,6 @@ CONFIG_B53_SRAB_DRIVER=m
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA_MT7530=m
-CONFIG_NET_DSA_MV88E6060=y
 # CONFIG_MICROCHIP_KSZ is not set
 CONFIG_NET_DSA_MV88E6XXX=y
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
@@ -1730,6 +1741,8 @@ CONFIG_CHELSIO_T4VF=m
 CONFIG_CHELSIO_LIB=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_GEMINI_ETHERNET=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
@@ -1859,6 +1872,7 @@ CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
@@ -2128,6 +2142,8 @@ CONFIG_MWIFIEX_USB=m
 CONFIG_MWL8K=m
 CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76x2E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2210,10 +2226,10 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
 # CONFIG_WAN is not set
+# CONFIG_NETDEVSIM is not set
 # CONFIG_ISDN is not set
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
-CONFIG_NVM_RRPC=m
 CONFIG_NVM_PBLK=m
 
 #
@@ -2306,7 +2322,6 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -2565,6 +2580,7 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_RK805=m
@@ -2580,7 +2596,6 @@ CONFIG_GPIO_GENERIC=y
 #
 CONFIG_GPIO_74XX_MMIO=m
 CONFIG_GPIO_ALTERA=m
-CONFIG_GPIO_AXP209=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -2632,6 +2647,7 @@ CONFIG_GPIO_TPS65218=m
 #
 # CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
 # CONFIG_GPIO_RDC321X is not set
 
 #
@@ -2830,6 +2846,7 @@ CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
@@ -2919,10 +2936,6 @@ CONFIG_USBPCWATCHDOG=m
 #
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
 CONFIG_SSB_BLOCKIO=y
@@ -2998,7 +3011,6 @@ CONFIG_MFD_RETU=m
 # CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_RDC321X is not set
 CONFIG_MFD_RT5033=m
-CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_RC5T583=y
 CONFIG_MFD_RK808=m
 CONFIG_MFD_RN5T618=y
@@ -3130,9 +3142,8 @@ CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_RC_CORE=y
 # CONFIG_RC_MAP is not set
+# CONFIG_LIRC is not set
 CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
@@ -3154,7 +3165,6 @@ CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
-# CONFIG_IR_GPIO_TX is not set
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SIR=m
@@ -3185,16 +3195,13 @@ CONFIG_V4L2_FWNODE=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
 CONFIG_DVB_CORE=y
+# CONFIG_DVB_MMAP is not set
 CONFIG_DVB_NET=y
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
 
 #
 # Media drivers
@@ -3417,6 +3424,12 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
@@ -3506,6 +3519,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_MEDIA_TUNER=y
 CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=y
 CONFIG_MEDIA_TUNER_TDA827X=y
 CONFIG_MEDIA_TUNER_TDA18271=y
@@ -3676,6 +3690,7 @@ CONFIG_DRM_TTM=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_VM=y
+CONFIG_DRM_SCHED=m
 
 #
 # I2C encoder or helper chips
@@ -3931,14 +3946,12 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
 CONFIG_SND_ATIIXP=m
 CONFIG_SND_ATIIXP_MODEM=m
 CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
 # CONFIG_SND_AW2 is not set
-CONFIG_SND_AZT3328=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_CA0106=m
@@ -3963,23 +3976,16 @@ CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
 CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LOLA=m
-CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -3987,8 +3993,6 @@ CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
 CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRTUOSO=m
@@ -4033,7 +4037,6 @@ CONFIG_SND_BCD2000=m
 # CONFIG_SND_USB_PODHD is not set
 # CONFIG_SND_USB_TONEPORT is not set
 # CONFIG_SND_USB_VARIAX is not set
-CONFIG_SND_SYNTH_EMUX=m
 CONFIG_AC97_BUS=m
 
 #
@@ -4080,6 +4083,7 @@ CONFIG_HID_KYE=y
 CONFIG_HID_GYRATION=m
 # CONFIG_HID_ICADE is not set
 CONFIG_HID_ITE=m
+# CONFIG_HID_JABRA is not set
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=y
 CONFIG_HID_LCPOWER=m
@@ -4178,6 +4182,7 @@ CONFIG_USB_WUSB_CBAF=m
 #
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
@@ -4415,6 +4420,7 @@ CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
 CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
 CONFIG_MMC_SDHCI_XENON=m
@@ -4452,6 +4458,7 @@ CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3692X=m
 CONFIG_LEDS_MT6323=m
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
@@ -4511,6 +4518,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -4675,10 +4683,7 @@ CONFIG_UIO=m
 # CONFIG_VFIO is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
+CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=m
@@ -4747,6 +4752,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# CONFIG_SOUNDWIRE is not set
 
 #
 # SOC (System On Chip) specific Drivers
@@ -4768,6 +4774,11 @@ CONFIG_RPMSG_VIRTIO=m
 # Qualcomm SoC drivers
 #
 CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+# CONFIG_XILINX_VCU is not set
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -4802,6 +4813,7 @@ CONFIG_MEMORY=y
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_BUFFER_CB=m
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_CONFIGFS=m
@@ -4859,6 +4871,7 @@ CONFIG_LTC2471=m
 CONFIG_PALMAS_GPADC=m
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
+# CONFIG_SD_ADC_MODULATOR is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
 CONFIG_TWL4030_MADC=m
@@ -4886,8 +4899,6 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 #
 # SSP Sensor Common
 #
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_CORE=m
 
 #
 # Counters
@@ -4904,7 +4915,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_DS4424 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
-CONFIG_MAX5821=m
+# CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_VF610_DAC is not set
 
@@ -4949,7 +4960,7 @@ CONFIG_MAX5821=m
 # Humidity sensors
 #
 # CONFIG_AM2315 is not set
-CONFIG_DHT11=m
+# CONFIG_DHT11 is not set
 # CONFIG_HDC100X is not set
 # CONFIG_HID_SENSOR_HUMIDITY is not set
 # CONFIG_HTS221 is not set
@@ -4974,7 +4985,7 @@ CONFIG_DHT11=m
 # CONFIG_APDS9960 is not set
 # CONFIG_BH1750 is not set
 # CONFIG_BH1780 is not set
-CONFIG_CM32181=m
+# CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set
 # CONFIG_CM3323 is not set
 # CONFIG_CM3605 is not set
@@ -4994,6 +5005,7 @@ CONFIG_CM32181=m
 # CONFIG_PA12203001 is not set
 # CONFIG_SI1145 is not set
 # CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_SENSORS_TSL2563 is not set
@@ -5003,6 +5015,7 @@ CONFIG_CM32181=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
 
 #
 # Magnetometer sensors
@@ -5025,7 +5038,7 @@ CONFIG_CM32181=m
 #
 # Inclinometer sensors
 #
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
 # CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
 
 #
@@ -5034,7 +5047,7 @@ CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-# CONFIG_IIO_SYSFS_TRIGGER is not set
+CONFIG_IIO_SYSFS_TRIGGER=m
 
 #
 # Digital potentiometers
@@ -5056,11 +5069,10 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 # CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
-CONFIG_MPL3115=m
+# CONFIG_MPL3115 is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
+# CONFIG_IIO_ST_PRESS is not set
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
 # CONFIG_ZPA2326 is not set
@@ -5081,7 +5093,7 @@ CONFIG_IIO_ST_PRESS_I2C=m
 #
 # Temperature sensors
 #
-CONFIG_HID_SENSOR_TEMP=m
+# CONFIG_HID_SENSOR_TEMP is not set
 # CONFIG_MLX90614 is not set
 # CONFIG_TMP006 is not set
 CONFIG_TMP007=m
@@ -5141,10 +5153,6 @@ CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
 # CONFIG_FPGA is not set
-
-#
-# FSI support
-#
 # CONFIG_FSI is not set
 CONFIG_MULTIPLEXER=m
 
@@ -5152,6 +5160,8 @@ CONFIG_MULTIPLEXER=m
 # Multiplexer drivers
 #
 CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
 
 #
 # Firmware Drivers
@@ -5351,7 +5361,6 @@ CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SMB311=y
 CONFIG_CIFS_FSCACHE=y
-# CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 CONFIG_NLS=y
@@ -5556,10 +5565,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_DMA_API_DEBUG is not set
-
-#
-# Runtime Testing
-#
+CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_SORT is not set
@@ -5568,7 +5574,7 @@ CONFIG_RBTREE_TEST=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
@@ -5581,7 +5587,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
-# CONFIG_TEST_FIND_BIT is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
@@ -5613,6 +5619,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
 CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 # CONFIG_SECURITY_SMACK is not set
@@ -5774,6 +5781,7 @@ CONFIG_CRYPTO_USER_API_AEAD=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
@@ -5859,7 +5867,7 @@ CONFIG_INTERVAL_TREE=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
-# CONFIG_DMA_NOOP_OPS is not set
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index d4604a5a4..c176ae956 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -58,6 +58,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 
 #
 # Kernel Performance Events And Counters
@@ -77,6 +78,7 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_VMAP_STACK=y
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_REFCOUNT=y
 
 #
@@ -92,10 +94,12 @@ CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
 
 #
 # Processor type and features
 #
+CONFIG_ZONE_DMA=y
 CONFIG_X86_FEATURE_NAMES=y
 CONFIG_X86_FAST_FEATURE_TESTS=y
 CONFIG_X86_X2APIC=y
@@ -122,6 +126,7 @@ CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_JAILHOUSE_GUEST is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
@@ -144,6 +149,9 @@ CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
 # CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=512
+CONFIG_NR_CPUS_DEFAULT=64
 CONFIG_NR_CPUS=64
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_X86_LOCAL_APIC=y
@@ -202,6 +210,7 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
@@ -212,7 +221,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_THP_SWAP=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
-CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
@@ -250,7 +259,6 @@ CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
-# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
 # CONFIG_LEGACY_VSYSCALL_EMULATE is not set
 CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
@@ -268,6 +276,7 @@ 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_SPCR_TABLE=y
 CONFIG_ACPI_LPIT=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
@@ -294,7 +303,6 @@ CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
@@ -315,6 +323,7 @@ CONFIG_ACPI_EXTLOG=m
 # CONFIG_PMIC_OPREGION is not set
 # CONFIG_ACPI_CONFIGFS is not set
 # CONFIG_TPS68470_PMIC_OPREGION is not set
+CONFIG_X86_PM_TIMER=y
 CONFIG_SFI=y
 
 #
@@ -572,6 +581,7 @@ CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
 CONFIG_LIQUIDIO=m
 CONFIG_LIQUIDIO_VF=m
 CONFIG_CHELSIO_T1_1G=y
@@ -924,7 +934,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=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
 
 #
@@ -951,7 +960,6 @@ CONFIG_IR_WINBOND_CIR=m
 # Multimedia core support
 #
 CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
 CONFIG_TTPCI_EEPROM=m
 
 #
@@ -1009,10 +1017,12 @@ CONFIG_MANTIS_CORE=m
 CONFIG_DVB_MANTIS=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
+# CONFIG_VIDEO_IPU3_CIO2 is not set
 
 #
 # common driver options
 #
+CONFIG_VIDEOBUF2_DVB=m
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 
@@ -1127,6 +1137,7 @@ CONFIG_DRM_VMWGFX=m
 # Display Interface Bridges
 #
 CONFIG_HSA_AMD=m
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
 # Frame buffer Devices
@@ -1161,12 +1172,23 @@ CONFIG_SND_PCSP=m
 CONFIG_SND_MTS64=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_SB_COMMON=m
+CONFIG_SND_ALS300=m
 CONFIG_SND_ALS4000=m
 CONFIG_SND_ALI5451=m
 CONFIG_SND_ASIHPI=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ICE1712=m
 CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
 
 #
 # HD-Audio
@@ -1177,6 +1199,7 @@ CONFIG_SND_USB_US122L=m
 # CONFIG_SND_SOC is not set
 CONFIG_SND_X86=y
 # CONFIG_HDMI_LPE_AUDIO is not set
+CONFIG_SND_SYNTH_EMUX=m
 
 #
 # Intel ISH HID support
@@ -1205,12 +1228,6 @@ CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_WBSD=m
-CONFIG_MMC_REALTEK_PCI=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_REALTEK_PCI=m
 
 #
 # LED drivers
@@ -1283,6 +1300,7 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_MF624=m
 CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VBOXGUEST=m
 
 #
 # Microsoft Hyper-V guest support
@@ -1290,12 +1308,13 @@ CONFIG_IRQ_BYPASS_MANAGER=m
 # CONFIG_HYPERV is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
+# CONFIG_ACER_WIRELESS is not set
 CONFIG_ACERHDF=m
 CONFIG_ALIENWARE_WMI=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMBIOS_WMI=m
-CONFIG_DELL_SMBIOS_SMM=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_DESCRIPTOR=m
@@ -1306,6 +1325,7 @@ CONFIG_DELL_SMO8800=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_TABLET is not set
 CONFIG_AMILO_RFKILL=m
+# CONFIG_GPD_POCKET_FAN is not set
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
@@ -1362,13 +1382,14 @@ CONFIG_SURFACE_3_BUTTON=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_TELEMETRY=m
 CONFIG_MLX_PLATFORM=m
-CONFIG_MLX_CPLD_PLATFORM=m
 CONFIG_INTEL_TURBO_MAX_3=y
+CONFIG_INTEL_CHTDC_TI_PWRBTN=m
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
 # CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+# CONFIG_MELLANOX_PLATFORM is not set
 
 #
 # Common Clock Framework
@@ -1474,6 +1495,7 @@ CONFIG_BTT=y
 # CONFIG_MUX_ADG792A is not set
 # CONFIG_MUX_GPIO is not set
 # CONFIG_MUX_MMIO is not set
+# CONFIG_UNISYS_VISORBUS is not set
 
 #
 # Firmware Drivers
@@ -1561,10 +1583,6 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_MMIOTRACE is not set
 # CONFIG_HIST_TRIGGERS is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-
-#
-# Runtime Testing
-#
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
@@ -1578,7 +1596,6 @@ CONFIG_DEBUG_WX=y
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -1667,6 +1684,7 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_SP_PSP=y
 CONFIG_CRYPTO_DEV_QAT=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_C3XXX=m
@@ -1688,6 +1706,7 @@ CONFIG_KVM_COMPAT=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_KVM_AMD_SEV=y
 CONFIG_KVM_MMU_AUDIT=y
 
 #
@@ -1699,6 +1718,7 @@ CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_HAS_IOPORT_MAP=y
+# CONFIG_DMA_DIRECT_OPS is not set
 CONFIG_UCS2_STRING=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 22d073a65..b6a82dcb2 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.15.18
+version    = 4.16.18
 release    = 1
 thisapp    = linux-%{version}
 
-- 
2.39.2