From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 20 Sep 2018 23:23:42 +0000 (+0100)
Subject: kernel: Update to 4.18.9
X-Git-Url: http://git.ipfire.org/?p=ipfire-3.x.git;a=commitdiff_plain;h=58640b551916e613e2e4cca042c7b97c993a38a6

kernel: Update to 4.18.9

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 1dcba18f3..da99adb64 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -39,22 +39,15 @@ CONFIG_ARCH_VEXPRESS=y
 #
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
-# CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCI_STUB is not set
-CONFIG_PCI_ECAM=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 
-#
-# PCI host controller drivers
-#
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-
 #
 # ARM errata workarounds via the alternatives framework
 #
@@ -63,6 +56,7 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_HW_PERF_EVENTS=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
 
 #
 # Boot options
@@ -100,7 +94,7 @@ CONFIG_QORIQ_CPUFREQ=m
 CONFIG_ARM_AMBA=y
 
 #
-# Generic Driver Options
+# Firmware loader
 #
 CONFIG_SOC_BUS=y
 CONFIG_DMA_CMA=y
@@ -536,6 +530,7 @@ CONFIG_SND_SOC_SIGMADSP_I2C=m
 CONFIG_SND_SOC_SIGMADSP_REGMAP=m
 CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
 CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_SSM2602_I2C=m
 CONFIG_SND_SOC_SSM4567=m
@@ -557,6 +552,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8524=m
@@ -569,6 +565,7 @@ CONFIG_SND_SOC_WM8741=m
 CONFIG_SND_SOC_WM8750=m
 CONFIG_SND_SOC_WM8753=m
 CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
 CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8903=m
@@ -579,6 +576,7 @@ CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_ZX_AUD96P22=m
 CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
 CONFIG_SND_SOC_NAU8540=m
 CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8824=m
@@ -604,6 +602,7 @@ CONFIG_MMC_MESON_GX=m
 CONFIG_MMC_MESON_MX_SDIO=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_PLTFM=m
+CONFIG_MMC_DW_BLUEFIELD=m
 CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_HI3798CV200=m
 CONFIG_MMC_DW_K3=m
diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 3bcf58f99..e2548f9a7 100644
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -22,6 +22,8 @@ CONFIG_KERNEL_XZ=y
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
 CONFIG_PERF_USE_VMALLOC=y
 
 #
@@ -119,7 +121,6 @@ CONFIG_SOC_EXYNOS5250=y
 CONFIG_SOC_EXYNOS5260=y
 CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5440=y
 CONFIG_SOC_EXYNOS5800=y
 # CONFIG_EXYNOS5420_MCPM is not set
 CONFIG_EXYNOS_CPU_SUSPEND=y
@@ -172,7 +173,6 @@ CONFIG_MACH_MT8127=y
 CONFIG_MACH_MT8135=y
 CONFIG_MACH_MESON6=y
 CONFIG_MACH_MESON8=y
-CONFIG_MACH_MESON8B=y
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_NPCM is not set
 CONFIG_ARCH_OMAP=y
@@ -184,7 +184,6 @@ CONFIG_ARCH_OMAP=y
 # CONFIG_OMAP_RESET_CLOCKS is not set
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
 
 #
@@ -252,10 +251,6 @@ CONFIG_ARCH_SUNXI_MC_SMP=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
-CONFIG_MACH_MOP500=y
-# CONFIG_MACH_HREFV60 is not set
-# CONFIG_MACH_SNOWBALL is not set
-CONFIG_UX500_AUTO_PLATFORM=y
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
@@ -300,6 +295,7 @@ CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_SPECTRE=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
@@ -334,17 +330,7 @@ CONFIG_ARM_ERRATA_798181=y
 # CONFIG_ARM_ERRATA_852423 is not set
 
 #
-# DesignWare PCI Core Support
-#
-CONFIG_PCI_EXYNOS=y
-CONFIG_PCI_IMX6=y
-CONFIG_PCI_KEYSTONE=y
-CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_HISI_STB=y
-
-#
-# PCI host controller drivers
+# Cadence PCIe controllers support
 #
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
@@ -354,9 +340,21 @@ CONFIG_PCIE_IPROC=m
 CONFIG_PCIE_IPROC_PLATFORM=m
 # CONFIG_PCIE_IPROC_BCMA is not set
 CONFIG_PCIE_IPROC_MSI=y
-# CONFIG_PCIE_ROCKCHIP is not set
+CONFIG_PCIE_ALTERA=y
+CONFIG_PCIE_ALTERA_MSI=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
 # CONFIG_PCIE_MEDIATEK is not set
 
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_KEYSTONE=y
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_HISI_STB=y
+
 #
 # PCI switch controller drivers
 #
@@ -424,7 +422,6 @@ CONFIG_AUTO_ZRELADDR=y
 # 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
 CONFIG_ARM_MEDIATEK_CPUFREQ=m
@@ -474,7 +471,7 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_TEGRA_AHB=y
 
 #
-# Generic Driver Options
+# Firmware loader
 #
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 
@@ -537,10 +534,10 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_ARC_EMAC_CORE=m
 CONFIG_EMAC_ROCKCHIP=m
-# CONFIG_MACB is not set
 CONFIG_BGMAC=y
 CONFIG_BGMAC_BCMA=m
 CONFIG_BGMAC_PLATFORM=y
+# CONFIG_MACB is not set
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
@@ -580,6 +577,11 @@ CONFIG_MDIO_BUS_MUX=y
 CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
 CONFIG_MDIO_SUN4I=m
 
+#
+# MII PHY device drivers
+#
+CONFIG_ATH10K_SNOC=m
+
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
@@ -699,7 +701,7 @@ CONFIG_OMAP_SSI=m
 #
 # PTP clock support
 #
-CONFIG_PTP_1588_CLOCK_GIANFAR=m
+CONFIG_PTP_1588_CLOCK_QORIQ=m
 
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
@@ -748,7 +750,6 @@ CONFIG_PINCTRL_SDM845=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM=y
-CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUN4I_A10=y
 CONFIG_PINCTRL_SUN5I=y
@@ -776,6 +777,7 @@ CONFIG_PINCTRL_TI_IODELAY=y
 #
 # MediaTek pinctrl drivers
 #
+CONFIG_EINT_MTK=y
 CONFIG_PINCTRL_MTK=y
 # CONFIG_PINCTRL_MT2701 is not set
 CONFIG_PINCTRL_MT8135=y
@@ -1011,6 +1013,9 @@ CONFIG_DRM_EXYNOS_MIC=y
 #
 # Sub-drivers
 #
+# CONFIG_DRM_EXYNOS_FIMC is not set
+# CONFIG_DRM_EXYNOS_ROTATOR is not set
+# CONFIG_DRM_EXYNOS_SCALER is not set
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
@@ -1024,6 +1029,7 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
 CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
 CONFIG_DRM_OMAP=m
@@ -1078,11 +1084,11 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
+CONFIG_DRM_V3D=m
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
-# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_DRM_TVE200 is not set
@@ -1146,6 +1152,7 @@ CONFIG_SND_SOC_MEDIATEK=m
 CONFIG_SND_SOC_MT2701=m
 CONFIG_SND_SOC_MT2701_CS42448=m
 CONFIG_SND_SOC_MT2701_WM8960=m
+CONFIG_SND_SOC_MT6797=m
 CONFIG_SND_SOC_MT8173=m
 CONFIG_SND_SOC_MT8173_MAX98090=m
 CONFIG_SND_SOC_MT8173_RT5650=m
@@ -1207,6 +1214,7 @@ CONFIG_SND_SYNTH_EMUX=m
 #
 # USB Host Controller Drivers
 #
+CONFIG_USB_XHCI_HISTB=m
 CONFIG_USB_XHCI_MTK=m
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_MXC=y
@@ -1253,6 +1261,7 @@ CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_EXYNOS=m
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_USB_DWC3_ST=m
+CONFIG_USB_DWC3_QCOM=m
 
 #
 # USB Physical Layer drivers
@@ -1262,6 +1271,7 @@ CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
 CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=y
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -1330,7 +1340,6 @@ CONFIG_RTC_DRV_MT7622=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
@@ -1344,10 +1353,11 @@ CONFIG_NBPFAXI_DMA=m
 # CONFIG_STE_DMA40 is not set
 CONFIG_ST_FDMA=m
 # CONFIG_TEGRA20_APB_DMA is not set
-# CONFIG_TI_CPPI41 is not set
-# CONFIG_TI_EDMA is not set
 CONFIG_MTK_HSDMA=m
 # CONFIG_QCOM_BAM_DMA is not set
+# CONFIG_TI_CPPI41 is not set
+# CONFIG_TI_EDMA is not set
+# CONFIG_DMA_OMAP is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -1389,6 +1399,7 @@ CONFIG_COMMON_CLK_MT2701=y
 # CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
 # CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
 # CONFIG_COMMON_CLK_MT2701_AUDSYS is not set
+# CONFIG_COMMON_CLK_MT2701_G3DSYS is not set
 CONFIG_COMMON_CLK_MT7622=y
 CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
@@ -1419,6 +1430,9 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_GCC_8994=m
 CONFIG_MSM_GCC_8996=m
 CONFIG_MSM_MMCC_8996=m
+CONFIG_MSM_GCC_8998=m
+CONFIG_SDM_GCC_845=m
+CONFIG_SDM_VIDEOCC_845=m
 CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
@@ -1534,6 +1548,8 @@ CONFIG_FSL_GUTS=y
 #
 # Qualcomm SoC drivers
 #
+# CONFIG_QCOM_COMMAND_DB is not set
+# CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GLINK_SSR is not set
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_MDT_LOADER=m
@@ -1544,6 +1560,7 @@ CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMP2P is not set
 # CONFIG_QCOM_SMSM is not set
 # CONFIG_QCOM_WCNSS_CTRL is not set
+# CONFIG_QCOM_APR is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
@@ -1590,7 +1607,6 @@ CONFIG_EXTCON_QCOM_SPMI_MISC=m
 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
 CONFIG_EXYNOS_SROM=y
@@ -1671,6 +1687,7 @@ CONFIG_PHY_HIX5HD2_SATA=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_XSPHY=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_QCOM_QMP=m
@@ -1741,6 +1758,7 @@ CONFIG_BCM47XX_NVRAM=y
 # Pseudo filesystems
 #
 CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 
 #
 # Memory Debugging
diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index 422a2048b..d1f8b3282 100644
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -1,6 +1,5 @@
 CONFIG_ARM64=y
 CONFIG_64BIT=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARM64_PAGE_SHIFT=16
 CONFIG_ARM64_CONT_SHIFT=5
 CONFIG_ARCH_MMAP_RND_BITS_MIN=14
@@ -11,7 +10,6 @@ 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
 
@@ -25,6 +23,7 @@ CONFIG_GENERIC_IRQ_MIGRATION=y
 #
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_NUMA_BALANCING is not set
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -38,6 +37,7 @@ CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_MMAP_RND_BITS=27
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
 CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_VMAP_STACK=y
 
 #
@@ -108,25 +108,25 @@ CONFIG_ARCH_XGENE=y
 #
 # Bus support
 #
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_LABEL=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=y
 
 #
-# DesignWare PCI Core Support
-#
-CONFIG_PCI_HISI=y
-# CONFIG_PCIE_KIRIN is not set
-
-#
-# PCI host controller drivers
+# Cadence PCIe controllers support
 #
+CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCI_HISI=y
+# CONFIG_PCIE_KIRIN is not set
+
 #
 # ARM errata workarounds via the alternatives framework
 #
@@ -186,10 +186,10 @@ 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_ARCH_HAS_PTE_SPECIAL=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
 CONFIG_ARMV8_DEPRECATED=y
@@ -242,7 +242,7 @@ CONFIG_ARM_DT_BL_CPUFREQ=m
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
-# Generic Driver Options
+# Firmware loader
 #
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 
@@ -303,6 +303,7 @@ CONFIG_CAVIUM_PTP=m
 CONFIG_LIQUIDIO=m
 CONFIG_LIQUIDIO_VF=m
 CONFIG_HNS3_ENET=m
+CONFIG_HINIC=m
 CONFIG_NET_SB1000=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_CAVIUM=m
@@ -523,6 +524,7 @@ CONFIG_IRQ_BYPASS_MANAGER=y
 # Common Clock Framework
 #
 CONFIG_COMMON_CLK_XGENE=y
+CONFIG_COMMON_CLK_MESON_AO=y
 CONFIG_COMMON_CLK_GXBB=y
 CONFIG_COMMON_CLK_AXG=y
 
@@ -669,6 +671,7 @@ CONFIG_ACPI_WATCHDOG=y
 # CONFIG_ACPI_CONFIGFS is not set
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_PPTT=y
 # CONFIG_TPS68470_PMIC_OPREGION is not set
 
 #
@@ -686,7 +689,6 @@ CONFIG_EFIVAR_FS=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_COMPAT=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_PMU=y
@@ -702,8 +704,6 @@ CONFIG_FRAME_POINTER=y
 # Memory Debugging
 #
 # CONFIG_KASAN is not set
-CONFIG_ARCH_HAS_KCOV=y
-# CONFIG_KCOV is not set
 
 #
 # RCU Debugging
@@ -746,6 +746,7 @@ 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_SM4_ARM64_CE is not set
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRC32_ARM64_CE=m
@@ -759,8 +760,11 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
 #
 # Library routines
 #
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_INDIRECT_PIO is not set
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_HAS_IOPORT_MAP=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DIRECT_OPS=y
+CONFIG_SWIOTLB=y
 CONFIG_UCS2_STRING=y
diff --git a/kernel/config-generic b/kernel/config-generic
index 69b5dd4cf..849f60668 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -1,10 +1,11 @@
+#
+#
+
 #
 #
 CONFIG_LOCKDEP_SUPPORT=y
 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
@@ -13,6 +14,9 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70300
+CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
@@ -20,7 +24,6 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -205,13 +208,13 @@ 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
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
@@ -221,11 +224,10 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
 CONFIG_GCC_PLUGIN_RANDSTRUCT=y
 CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y
-CONFIG_HAVE_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_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -331,8 +333,6 @@ CONFIG_SMP=y
 # CONFIG_GOLDFISH is not set
 # 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
@@ -449,15 +449,22 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_ECAM=y
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
 
 #
 # Cadence PCIe controllers support
 #
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
 
 #
 # DesignWare PCI Core Support
@@ -465,10 +472,7 @@ CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_DW_PLAT=y
-
-#
-# PCI host controller drivers
-#
+CONFIG_PCIE_DW_PLAT_HOST=y
 
 #
 # PCI Endpoint
@@ -505,6 +509,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
 CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=y
@@ -515,6 +520,7 @@ CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -605,6 +611,7 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
 # CONFIG_NETLABEL is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
@@ -663,20 +670,17 @@ CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_OSF=m
 CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_EXTHDR=m
-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
 CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
@@ -691,6 +695,7 @@ CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_FIB=m
 CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_SOCKET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -822,6 +827,7 @@ CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
 CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
@@ -830,6 +836,11 @@ CONFIG_IP_VS_NQ=m
 #
 CONFIG_IP_VS_SH_TAB_BITS=8
 
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
 #
 # IPVS application helper
 #
@@ -843,6 +854,7 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
@@ -856,7 +868,7 @@ CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=y
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
@@ -874,6 +886,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_CHAIN_NAT_IPV6=m
@@ -887,10 +900,9 @@ CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=y
 # CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_NF_TABLES_BRIDGE=y
-CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
@@ -914,6 +926,8 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
+CONFIG_BPFILTER_UMH=m
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -1107,7 +1121,6 @@ CONFIG_BT_LEDS=y
 CONFIG_BT_INTEL=m
 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
@@ -1116,9 +1129,7 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
@@ -1182,8 +1193,10 @@ CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
 CONFIG_NET_DEVLINK=y
 CONFIG_MAY_USE_DEVLINK=y
+CONFIG_FAILOVER=m
 CONFIG_HAVE_EBPF_JIT=y
 
 #
@@ -1198,6 +1211,10 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
@@ -1595,6 +1612,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
 CONFIG_DM_MIRROR=y
 CONFIG_DM_LOG_USERSPACE=m
@@ -1704,7 +1722,6 @@ 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
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -1721,6 +1738,7 @@ CONFIG_BNXT=m
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_CADENCE=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
@@ -1749,13 +1767,10 @@ CONFIG_BE2NET=m
 CONFIG_BE2NET_HWMON=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E100=m
 CONFIG_E1000=m
@@ -1771,7 +1786,10 @@ CONFIG_I40E=m
 CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
-CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
@@ -1799,6 +1817,9 @@ CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
@@ -1808,6 +1829,7 @@ CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_NI=y
 CONFIG_NET_VENDOR_8390=y
@@ -1834,6 +1856,8 @@ CONFIG_QED_OOO=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCOM_EMAC=m
 # CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
@@ -1841,23 +1865,21 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
 CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
@@ -1873,6 +1895,9 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
@@ -1887,9 +1912,6 @@ CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_DIRECT is not set
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_DWC_XLGMAC=m
-CONFIG_DWC_XLGMAC_PCI=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_MDIO_DEVICE=y
@@ -1900,6 +1922,9 @@ CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 # CONFIG_MDIO_GPIO is not set
 CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_PHYLINK=y
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
 CONFIG_LED_TRIGGER_PHY=y
@@ -1907,8 +1932,10 @@ CONFIG_LED_TRIGGER_PHY=y
 #
 # MII PHY device drivers
 #
+CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
+CONFIG_ASIX_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
@@ -1918,6 +1945,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_CORTINA_PHY=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
 CONFIG_FIXED_PHY=y
@@ -1929,6 +1957,7 @@ CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -2033,6 +2062,7 @@ CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
 # CONFIG_WIL6210_DEBUGFS is not set
 CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_AHB=y
 CONFIG_ATH10K_SDIO=m
@@ -2218,6 +2248,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 #
 # CONFIG_WAN is not set
 # CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
@@ -2275,6 +2306,7 @@ CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TWL4030=m
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KEYBOARD_BCM=m
+CONFIG_KEYBOARD_MTK_PMIC=m
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
@@ -2285,6 +2317,7 @@ CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
+# CONFIG_MOUSE_PS2_ELANTECH_SMBUS is not set
 CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
@@ -2431,7 +2464,6 @@ CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 CONFIG_HVC_DRIVER=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PROC_INTERFACE is not set
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
@@ -2577,6 +2609,7 @@ CONFIG_PINCTRL_AXP209=m
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_RK805=m
 CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
@@ -3114,6 +3147,7 @@ CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
@@ -3189,7 +3223,6 @@ CONFIG_V4L2_FLASH_LED_CLASS=m
 CONFIG_V4L2_FWNODE=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
 CONFIG_DVB_CORE=y
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_NET=y
@@ -3395,6 +3428,7 @@ CONFIG_DVB_PT3=m
 CONFIG_DVB_SMIPCIE=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CADENCE is not set
 # CONFIG_VIDEO_MUX is not set
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_PLATFORM=m
@@ -3676,7 +3710,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
-CONFIG_DRM_DEBUG_MM_SELFTEST=m
+# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -3693,6 +3727,7 @@ CONFIG_DRM_SCHED=m
 #
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
+CONFIG_DRM_I2C_NXP_TDA9950=m
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
@@ -3710,7 +3745,6 @@ CONFIG_DRM_AMD_ACP=y
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
-# CONFIG_DRM_AMD_DC_PRE_VEGA is not set
 # CONFIG_DRM_AMD_DC_FBC is not set
 # CONFIG_DEBUG_KERNEL_DC is not set
 
@@ -3766,6 +3800,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_CDNS_DSI=m
 CONFIG_DRM_DUMB_VGA_DAC=m
 CONFIG_DRM_LVDS_ENCODER=m
 CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
@@ -3774,6 +3809,7 @@ CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_SII9234=m
+CONFIG_DRM_THINE_THC63LVD1024=m
 CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_I2C_ADV7511 is not set
@@ -3786,7 +3822,6 @@ CONFIG_DRM_MXS=y
 CONFIG_DRM_MXSFB=m
 CONFIG_DRM_TINYDRM=m
 # CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_LIB_RANDOM=y
 
 #
 # Frame buffer Devices
@@ -3846,7 +3881,6 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
 CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
@@ -4092,6 +4126,7 @@ CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGIWHEELS_FF is not set
 # CONFIG_HID_MAGICMOUSE is not set
 # CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 # CONFIG_HID_MULTITOUCH is not set
@@ -4115,6 +4150,7 @@ CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 # CONFIG_HID_SONY is not set
 CONFIG_HID_SPEEDLINK=m
+# CONFIG_HID_STEAM is not set
 # CONFIG_HID_STEELSERIES is not set
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
@@ -4269,7 +4305,6 @@ CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_OF=m
 CONFIG_USB_CHIPIDEA_PCI=m
 # CONFIG_USB_CHIPIDEA_HOST is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
 CONFIG_USB_ISP1760=m
 CONFIG_USB_ISP1760_HCD=y
 CONFIG_USB_ISP1760_HOST_ROLE=y
@@ -4458,6 +4493,7 @@ CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 CONFIG_LEDS_LM3692X=m
+CONFIG_LEDS_LM3601X=m
 CONFIG_LEDS_MT6323=m
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
@@ -4871,6 +4907,11 @@ CONFIG_TWL4030_MADC=m
 CONFIG_VF610_ADC=m
 # CONFIG_VIPERBOARD_ADC is not set
 
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+
 #
 # Amplifiers
 #
@@ -4904,12 +4945,14 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_AD5380 is not set
 # CONFIG_AD5446 is not set
 # CONFIG_AD5593R is not set
+# CONFIG_AD5696_I2C is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
+# CONFIG_TI_DAC5571 is not set
 # CONFIG_VF610_DAC is not set
 
 #
@@ -5004,6 +5047,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_TCS3472 is not set
 # CONFIG_SENSORS_TSL2563 is not set
 # CONFIG_TSL2583 is not set
+# CONFIG_TSL2772 is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
@@ -5086,6 +5130,10 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 
+#
+# Resolver to digital converters
+#
+
 #
 # Temperature sensors
 #
@@ -5195,6 +5243,7 @@ CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
 CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_XFS_ONLINE_REPAIR=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
@@ -5222,6 +5271,7 @@ CONFIG_QUOTA_TREE=y
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=m
@@ -5249,7 +5299,6 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
 
 #
 # DOS/FAT/NT Filesystems
@@ -5274,6 +5323,7 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
+CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
@@ -5473,6 +5523,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 CONFIG_DEBUG_SHIRQ=y
 
 #
@@ -5583,6 +5636,7 @@ CONFIG_RBTREE_TEST=m
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_PARMAN is not set
@@ -5686,6 +5740,11 @@ CONFIG_CRYPTO_ENGINE=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=m
 
@@ -5766,6 +5825,7 @@ CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
 
 #
 # Random Number Generation
@@ -5836,6 +5896,7 @@ CONFIG_CRC4=m
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
+CONFIG_XXHASH=m
 CONFIG_RANDOM32_SELFTEST=y
 CONFIG_842_COMPRESS=y
 CONFIG_842_DECOMPRESS=y
@@ -5845,6 +5906,8 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -5872,6 +5935,8 @@ CONFIG_INTERVAL_TREE=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
@@ -5895,5 +5960,4 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-CONFIG_PRIME_NUMBERS=m
 # CONFIG_STRING_SELFTEST is not set
diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index c38870636..7a727d3d6 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -60,6 +60,8 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
 
 #
 # Kernel Performance Events And Counters
@@ -77,6 +79,7 @@ CONFIG_ARCH_MMAP_RND_BITS=32
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
 CONFIG_ISA_BUS_API=y
 CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_VMAP_STACK=y
 CONFIG_ARCH_HAS_REFCOUNT=y
 
@@ -95,6 +98,7 @@ CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
 CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 
 #
 # Processor type and features
@@ -180,8 +184,6 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_X86_MSR is not set
 CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_X86_DIRECT_GBPAGES=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 # CONFIG_AMD_MEM_ENCRYPT is not set
@@ -223,6 +225,7 @@ CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_X86_PMEM_LEGACY_DEVICE=y
 CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -354,13 +357,13 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_MMCONF_FAM10H=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIE_ECRC=y
 # CONFIG_PCIEASPM_DEFAULT is not set
 CONFIG_PCIEASPM_POWERSAVE=y
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
+CONFIG_PCI_PF_STUB=m
 CONFIG_PCI_ATS=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PCI_IOV=y
@@ -371,8 +374,9 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
-# PCI host controller drivers
+# Cadence PCIe controllers support
 #
+CONFIG_PCI_FTPCI100=y
 CONFIG_VMD=m
 
 #
@@ -424,7 +428,7 @@ CONFIG_BT_MRVL_SDIO=m
 CONFIG_RFKILL_GPIO=m
 
 #
-# Generic Driver Options
+# Firmware loader
 #
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
@@ -566,11 +570,11 @@ CONFIG_AMD8111_ETH=m
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_HAVE_ECC=y
 CONFIG_AQTION=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_BNXT_SRIOV=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MACB_PCI=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNXT_SRIOV=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
@@ -959,7 +963,6 @@ CONFIG_DVB_TTUSB_DEC=m
 # Media capture support
 #
 CONFIG_VIDEO_MEYE=m
-# CONFIG_VIDEO_ZORAN is not set
 
 #
 # Media capture/analog/hybrid TV support
@@ -1034,6 +1037,7 @@ CONFIG_VIDEO_SAA6752HS=m
 # soc_camera sensor drivers
 #
 CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
 
 #
 # Multistandard (satellite) frontends
@@ -1126,6 +1130,7 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_DEBUG is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
 # CONFIG_DRM_I915_SELFTEST is not set
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
@@ -1365,7 +1370,6 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_CHT_INT33FE=m
 CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_VBTN=m
@@ -1393,6 +1397,7 @@ CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
+# CONFIG_CHROMEOS_TBMC is not set
 # CONFIG_CROS_KBD_LED_BACKLIGHT is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 
@@ -1519,6 +1524,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
 
 #
@@ -1532,6 +1538,7 @@ CONFIG_QUOTACTL_COMPAT=y
 #
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 # CONFIG_HUGETLBFS is not set
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_EFIVAR_FS=m
@@ -1547,8 +1554,6 @@ CONFIG_STACK_VALIDATION=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_KASAN is not set
-CONFIG_ARCH_HAS_KCOV=y
-# CONFIG_KCOV is not set
 
 #
 # Debug Lockups and Hangs
@@ -1621,6 +1626,16 @@ CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_GLUE_HELPER_X86=y
 
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_MORUS640_SSE2 is not set
+# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
+# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
+
 #
 # Block modes
 #
@@ -1705,7 +1720,11 @@ CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_HAS_IOPORT_MAP=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DIRECT_OPS=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
 CONFIG_UCS2_STRING=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 160940ab6..90e536861 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.17.19
+version    = 4.18.9
 release    = 1
 thisapp    = linux-%{version}
 
diff --git a/kernel/scripts/configcommon.py b/kernel/scripts/configcommon.py
index 54f355add..003b562ec 100755
--- a/kernel/scripts/configcommon.py
+++ b/kernel/scripts/configcommon.py
@@ -27,6 +27,9 @@ for filename in filelist:
 		if line.endswith("Kernel Configuration"):
 			continue
 
+		if line.startswith("# Compiler:"):
+			continue
+
 		option = value = None
 
 		m = re.match("^# (.*) is not set$", line)