kernel: Update to 5.1

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 1a49710a768bb6bfe287b7911961fd07cd365824..12e382790e0014de4b450ef77b4b56b34c954fe2 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -77,7 +77,6 @@ CONFIG_ARM_SCMI_POWER_DOMAIN=m
 CONFIG_ARM_SCPI_PROTOCOL=m
 CONFIG_ARM_SCPI_POWER_DOMAIN=m
 # CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_INTEL_STRATIX10_SERVICE is not set
 
 #
 # Tegra firmware driver
@@ -118,17 +117,6 @@ CONFIG_PCI_SYSCALL=y
 # Firmware loader
 #
 CONFIG_SOC_BUS=y
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
 
 #
@@ -411,7 +399,10 @@ CONFIG_DVB_LNBP21=y
 # I2C encoder or helper chips
 #
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
-CONFIG_DRM_ARM=y
+
+#
+# ARM devices
+#
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 CONFIG_DRM_MALI_DISPLAY=m
@@ -463,6 +454,7 @@ CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_I2S_HI6210_I2S=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_MTK_BTCVSD=m
 
 #
 # ASoC support for Amlogic platforms
@@ -482,6 +474,8 @@ CONFIG_SND_MESON_AXG_PDM=m
 #
 # STMicroelectronics STM32 SOC audio support
 #
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
+CONFIG_SND_SOC_XILINX_SPDIF=m
 CONFIG_ZX_TDM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
@@ -509,6 +503,7 @@ CONFIG_SND_SOC_CS35L32=m
 CONFIG_SND_SOC_CS35L33=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
 CONFIG_SND_SOC_CS42L42=m
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
@@ -522,6 +517,7 @@ CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
 CONFIG_SND_SOC_DA7219=m
@@ -556,6 +552,7 @@ CONFIG_SND_SOC_PCM3168A=m
 CONFIG_SND_SOC_PCM3168A_I2C=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_RK3328=m
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT5616=m
 CONFIG_SND_SOC_RT5631=m
@@ -606,6 +603,7 @@ CONFIG_SND_SOC_WM8782=m
 CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
 CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
@@ -614,6 +612,7 @@ CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_ZX_AUD96P22=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_NAU8540=m
 CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
@@ -621,9 +620,7 @@ CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_SND_AUDIO_GRAPH_SCU_CARD=m
 
 #
 # USB Physical Layer drivers
@@ -663,6 +660,7 @@ CONFIG_RTC_DRV_PL031=m
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 # CONFIG_AMBA_PL08X is not set
+CONFIG_FSL_QDMA=m
 # CONFIG_PL330_DMA is not set
 CONFIG_XILINX_DMA=m
 CONFIG_XILINX_ZYNQMP_DMA=m
@@ -681,8 +679,12 @@ CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
 CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_AMLOGIC=y
-CONFIG_COMMON_CLK_REGMAP_MESON=y
+CONFIG_COMMON_CLK_MESON_REGMAP=y
+CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_PHASE=m
+CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
+CONFIG_COMMON_CLK_AXG_AUDIO=m
 
 #
 # Clock Source drivers
@@ -776,6 +778,8 @@ CONFIG_MESON_MX_EFUSE=m
 # Library routines
 #
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_DMA_REMAP=y
 
 #

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 28be4dccf287a8030ffb5201192916964d82c335..54f4a2e69c139f74080fad3a639e2e91f6952bd6 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -9,9 +9,13 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZ4 is not set
 
 #
-# RCU Subsystem
+# Timers subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
+
+#
+# RCU Subsystem
+#
 CONFIG_PERF_USE_VMALLOC=y
 
 #
@@ -153,10 +157,12 @@ CONFIG_ARCH_MEDIATEK=y
 CONFIG_MACH_MT6589=y
 CONFIG_MACH_MT6592=y
 CONFIG_MACH_MT7623=y
+CONFIG_MACH_MT7629=y
 CONFIG_MACH_MT8127=y
 CONFIG_MACH_MT8135=y
 CONFIG_MACH_MESON6=y
 CONFIG_MACH_MESON8=y
+# CONFIG_ARCH_MILBEAUT is not set
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_NPCM is not set
 CONFIG_ARCH_OMAP=y
@@ -380,7 +386,7 @@ CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=y
-CONFIG_ARM_TEGRA124_CPUFREQ=m
+CONFIG_ARM_TEGRA124_CPUFREQ=y
 CONFIG_ARM_TI_CPUFREQ=y
 
 #
@@ -439,6 +445,7 @@ CONFIG_CRYPTO_CRC32_ARM_CE=m
 # General architecture-dependent options
 #
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_MMAP_RND_BITS=16
@@ -495,6 +502,8 @@ CONFIG_PCIE_ROCKCHIP_HOST=m
 #
 # DesignWare PCI Core Support
 #
+CONFIG_PCI_DRA7XX=y
+CONFIG_PCI_DRA7XX_HOST=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_KEYSTONE=y
 CONFIG_PCI_LAYERSCAPE=y
@@ -526,6 +535,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # Misc devices
 #
 # CONFIG_QCOM_COINCELL is not set
+# CONFIG_QCOM_FASTRPC is not set
 CONFIG_SRAM_EXEC=y
 
 #
@@ -594,6 +604,7 @@ CONFIG_AX88796_93CX6=y
 CONFIG_SMC911X=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MEDIATEK=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_STI=m
 CONFIG_DWMAC_SUNXI=m
@@ -601,7 +612,6 @@ CONFIG_DWMAC_SUN8I=m
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
-CONFIG_TI_CPSW_PHY_SEL=y
 CONFIG_TI_CPSW=m
 # CONFIG_TI_CPTS is not set
 CONFIG_NET_VENDOR_XILINX=y
@@ -818,6 +828,7 @@ CONFIG_PINCTRL_MTK=y
 CONFIG_PINCTRL_MTK_MOORE=y
 # CONFIG_PINCTRL_MT2701 is not set
 CONFIG_PINCTRL_MT7623=y
+CONFIG_PINCTRL_MT7629=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
@@ -878,6 +889,7 @@ CONFIG_MTK_THERMAL=m
 #
 CONFIG_BRCMSTB_THERMAL=m
 CONFIG_BCM_NS_THERMAL=y
+CONFIG_BCM_SR_THERMAL=y
 
 #
 # Texas Instruments thermal drivers
@@ -1129,8 +1141,6 @@ CONFIG_DRM_DW_MIPI_DSI=m
 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_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 # CONFIG_DRM_TVE200 is not set
@@ -1177,6 +1187,7 @@ CONFIG_SND_DESIGNWARE_PCM=y
 #
 # Common SoC Audio options for Freescale CPUs:
 #
+# CONFIG_SND_SOC_FSL_MICFIL is not set
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_IMX_SOC=m
@@ -1200,6 +1211,7 @@ CONFIG_SND_SOC_MT8173_MAX98090=m
 CONFIG_SND_SOC_MT8173_RT5650=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
+CONFIG_SND_SOC_MT8183=m
 
 #
 # ASoC support for Amlogic platforms
@@ -1318,6 +1330,7 @@ CONFIG_USB_DWC3_QCOM=m
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
+CONFIG_TWL6030_USB=m
 CONFIG_USB_MXS_PHY=m
 CONFIG_USB_TEGRA_PHY=y
 
@@ -1371,6 +1384,7 @@ CONFIG_RTC_DRV_CMOS=y
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_IMXDI=m
+CONFIG_RTC_DRV_MESON=m
 CONFIG_RTC_DRV_OMAP=m
 CONFIG_RTC_DRV_S3C=m
 # CONFIG_RTC_DRV_VT8500 is not set
@@ -1459,6 +1473,7 @@ CONFIG_COMMON_CLK_MT7629_ETHSYS=y
 CONFIG_COMMON_CLK_MT7629_HIFSYS=y
 CONFIG_COMMON_CLK_MT8135=y
 CONFIG_COMMON_CLK_MT8173=y
+CONFIG_COMMON_CLK_MESON_INPUT=m
 CONFIG_COMMON_CLK_MESON8B=y
 CONFIG_KRAIT_CLOCKS=y
 CONFIG_QCOM_GDSC=y
@@ -1513,6 +1528,7 @@ CONFIG_SUN8I_R40_CCU=y
 CONFIG_SUN9I_A80_CCU=y
 CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
+CONFIG_TEGRA_CLK_DFLL=y
 CONFIG_COMMON_CLK_TI_ADPLL=m
 # CONFIG_HWSPINLOCK_OMAP is not set
 CONFIG_HWSPINLOCK_QCOM=m
@@ -1609,6 +1625,11 @@ CONFIG_BRCMSTB_PM=y
 #
 CONFIG_FSL_GUTS=y
 
+#
+# i.MX SoC drivers
+#
+# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
+
 #
 # MediaTek SoC drivers
 #
@@ -1713,7 +1734,8 @@ CONFIG_PWM_BCM_IPROC=y
 CONFIG_PWM_BERLIN=m
 CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_HIBVT=m
-# CONFIG_PWM_IMX is not set
+CONFIG_PWM_IMX1=m
+CONFIG_PWM_IMX27=m
 # CONFIG_PWM_MTK_DISP is not set
 CONFIG_PWM_MEDIATEK=m
 CONFIG_PWM_OMAP_DMTIMER=m
@@ -1741,6 +1763,7 @@ CONFIG_IRQ_CROSSBAR=y
 CONFIG_IMX_IRQSTEER=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
+CONFIG_RESET_BRCMSTB=y
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
@@ -1756,6 +1779,7 @@ CONFIG_COMMON_RESET_HI6220=m
 # PHY Subsystem
 #
 CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_BCM_NS_USB2=m
 CONFIG_PHY_BCM_NS_USB3=m
@@ -1795,6 +1819,8 @@ CONFIG_PHY_STIH407_USB=m
 CONFIG_PHY_TEGRA_XUSB=m
 CONFIG_PHY_DM816X_USB=m
 CONFIG_OMAP_CONTROL_PHY=m
+CONFIG_OMAP_USB2=m
+CONFIG_TI_PIPE3=m
 CONFIG_TWL4030_USB=m
 CONFIG_PHY_TI_GMII_SEL=m
 

diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index 0b6b413d50c81559e10206328b9a54e69920c0db..87ef8d1c51e7ba0ff675f36157a7caefa12c3cfc 100644 (file)
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -1,9 +1,13 @@
 CONFIG_THREAD_INFO_IN_TASK=y
 
 #
-# RCU Subsystem
+# Timers subsystem
 #
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
+
+#
+# RCU Subsystem
+#
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_NUMA_BALANCING is not set
@@ -33,6 +37,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_BITMAIN is not set
 # CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_K3 is not set
@@ -82,6 +87,7 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
 # CONFIG_HISILICON_ERRATUM_161600802 is not set
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_FUJITSU_ERRATUM_010001=y
 # CONFIG_ARM64_4K_PAGES is not set
 # CONFIG_ARM64_16K_PAGES is not set
 CONFIG_ARM64_64K_PAGES=y
@@ -139,6 +145,7 @@ CONFIG_ARM64_CNP=y
 CONFIG_ARM64_PTR_AUTH=y
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
+# CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
@@ -183,6 +190,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
+CONFIG_EFI_EARLYCON=y
 
 #
 # Tegra firmware driver
@@ -258,8 +266,8 @@ 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
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
 # GCOV-based kernel profiling
@@ -367,6 +375,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=y
 CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
+# CONFIG_PCIE_ALTERA is not set
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 
@@ -469,6 +478,7 @@ CONFIG_HVC_DCC=y
 CONFIG_IPMI_DMI_DECODE=y
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM_CAVIUM=y
+CONFIG_HW_RANDOM_OPTEE=m
 
 #
 # I2C support
@@ -594,6 +604,11 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 #
 # CONFIG_SND_DESIGNWARE_PCM is not set
 
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_MICFIL=m
+
 #
 # STMicroelectronics STM32 SOC audio support
 #
@@ -642,11 +657,6 @@ CONFIG_BCM_SBA_RAID=m
 CONFIG_MV_XOR_V2=y
 CONFIG_XGENE_DMA=m
 
-#
-# DMA Clients
-#
-CONFIG_DMA_ENGINE_RAID=y
-
 #
 # Xen driver support
 #
@@ -656,11 +666,14 @@ CONFIG_XEN_EFI=y
 # Common Clock Framework
 #
 CONFIG_COMMON_CLK_XGENE=y
-CONFIG_COMMON_CLK_AMLOGIC_AUDIO=y
-CONFIG_COMMON_CLK_MESON_AO=y
+CONFIG_COMMON_CLK_MESON_INPUT=y
+CONFIG_COMMON_CLK_MESON_DUALDIV=y
+CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
+CONFIG_COMMON_CLK_MESON_AO_CLKC=y
+CONFIG_COMMON_CLK_MESON_EE_CLKC=y
 CONFIG_COMMON_CLK_GXBB=y
 CONFIG_COMMON_CLK_AXG=y
-CONFIG_COMMON_CLK_AXG_AUDIO=m
+CONFIG_COMMON_CLK_G12A=y
 
 #
 # Clock Source drivers
@@ -790,6 +803,10 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
 CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
 CONFIG_DMA_DIRECT_REMAP=y
+
+#
+# Default contiguous memory area size:
+#
 CONFIG_UCS2_STRING=y
 CONFIG_SG_SPLIT=y
 CONFIG_ARCH_HAS_PMEM_API=y

diff --git a/kernel/config-generic b/kernel/config-generic
index ed45e1b21b3217ab461333fe3eda15642ef3cbc8..fcda84ca2f6f4e03a6685999d153e091b5b09006 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -7,6 +7,7 @@ CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
@@ -58,6 +59,7 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 # CONFIG_NO_HZ_IDLE is not set
 CONFIG_NO_HZ_FULL=y
+CONFIG_CONTEXT_TRACKING=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT_NONE=y
@@ -90,7 +92,6 @@ CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_CONTEXT_TRACKING=y
 CONFIG_RCU_NOCB_CPU=y
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=18
@@ -160,6 +161,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
@@ -278,6 +280,7 @@ CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set
 
 #
 # Bus options (PCI etc.)
@@ -342,6 +345,7 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
@@ -359,6 +363,8 @@ CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
 CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
 CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
 CONFIG_GCC_PLUGIN_RANDSTRUCT=y
@@ -487,6 +493,7 @@ CONFIG_SKB_EXTENSIONS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=y
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 CONFIG_TLS_DEVICE=y
@@ -625,7 +632,7 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
@@ -651,6 +658,7 @@ CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
 CONFIG_NF_TABLES_INET=y
@@ -848,11 +856,6 @@ CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
@@ -868,9 +871,6 @@ 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
-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
@@ -878,8 +878,6 @@ 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_NF_NAT_MASQUERADE_IPV6=y
 # CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_TABLES_BRIDGE=y
@@ -1114,7 +1112,6 @@ CONFIG_GRO_CELLS=y
 CONFIG_SOCK_VALIDATE_XMIT=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
-CONFIG_MAY_USE_DEVLINK=y
 CONFIG_FAILOVER=m
 CONFIG_HAVE_EBPF_JIT=y
 
@@ -1136,6 +1133,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
+# CONFIG_PCIE_BW is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
@@ -1328,6 +1326,7 @@ CONFIG_ALTERA_STAPL=m
 #
 # VOP Bus Driver
 #
+# CONFIG_VOP_BUS is not set
 
 #
 # Intel MIC Host Driver
@@ -1352,6 +1351,7 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_MISC_ALCOR_PCI=m
 # CONFIG_MISC_RTSX_PCI is not set
 CONFIG_MISC_RTSX_USB=m
+# CONFIG_HABANA_AI is not set
 
 #
 # SCSI device support
@@ -1443,6 +1443,7 @@ CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 # CONFIG_SCSI_SNIC is not set
 CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
@@ -1476,10 +1477,6 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -1612,6 +1609,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 # CONFIG_DM_DELAY is not set
+# CONFIG_DM_INIT is not set
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_FLAKEY is not set
 CONFIG_DM_VERITY=m
@@ -1637,6 +1635,7 @@ CONFIG_IFB=m
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
 CONFIG_IPVLAN=m
 CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
@@ -1908,6 +1907,7 @@ CONFIG_DWC_XLGMAC_PCI=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
@@ -1927,6 +1927,7 @@ CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 # CONFIG_MDIO_GPIO is not set
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
@@ -2197,6 +2198,7 @@ CONFIG_MT76x0E=m
 CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2354,6 +2356,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GP2A is not set
@@ -2385,6 +2388,7 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
 # CONFIG_RMI4_SMB is not set
@@ -2433,6 +2437,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 
 #
@@ -2479,6 +2484,7 @@ CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_PLAT_DATA=y
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
@@ -2488,7 +2494,6 @@ CONFIG_IPMI_POWEROFF=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_R3964=m
 # CONFIG_APPLICOM is not set
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=8192
@@ -2650,6 +2655,7 @@ CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SYSCON=m
+CONFIG_GPIO_AMD_FCH=m
 
 #
 # Port-mapped I/O GPIO drivers
@@ -2660,6 +2666,7 @@ CONFIG_GPIO_SYSCON=m
 #
 # CONFIG_GPIO_ADP5588 is not set
 CONFIG_GPIO_ADNP=m
+CONFIG_GPIO_GW_PLD=m
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
@@ -2684,6 +2691,7 @@ CONFIG_GPIO_TPS65218=m
 # CONFIG_GPIO_TPS6586X is not set
 # CONFIG_GPIO_TPS65910 is not set
 # CONFIG_GPIO_TPS65912 is not set
+# CONFIG_GPIO_TQMX86 is not set
 # CONFIG_GPIO_TWL4030 is not set
 # CONFIG_GPIO_TWL6040 is not set
 # CONFIG_GPIO_WM831X is not set
@@ -2972,6 +2980,7 @@ CONFIG_TWL4030_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MAX77620_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
+CONFIG_STPMIC1_WATCHDOG=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_KEMPLD_WDT=m
@@ -3107,6 +3116,8 @@ CONFIG_TWL6040_CORE=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_LM3533=m
 CONFIG_MFD_TC3589X=y
+CONFIG_MFD_TQMX86=m
+# CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 CONFIG_MFD_WM8400=y
 CONFIG_MFD_WM831X=y
@@ -3115,6 +3126,7 @@ CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=y
 CONFIG_MFD_ROHM_BD718XX=m
+CONFIG_MFD_STPMIC1=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_88PG86X=m
@@ -3179,6 +3191,7 @@ CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
@@ -3213,6 +3226,7 @@ CONFIG_IR_SHARP_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_XMP_DECODER=m
 # CONFIG_IR_IMON_DECODER is not set
+CONFIG_IR_RCMM_DECODER=m
 CONFIG_RC_DEVICES=y
 # CONFIG_RC_ATI_REMOTE is not set
 # CONFIG_IR_HIX5HD2 is not set
@@ -3462,8 +3476,6 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CADENCE is not set
 # CONFIG_VIDEO_ASPEED is not set
 # CONFIG_VIDEO_MUX is not set
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_PLATFORM=m
 # CONFIG_VIDEO_XILINX is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
@@ -3536,7 +3548,6 @@ CONFIG_VIDEO_CX25840=m
 #
 CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -3558,24 +3569,6 @@ CONFIG_VIDEO_MT9V011=m
 #
 # Miscellaneous helper chips
 #
-
-#
-# Sensors used on soc_camera driver
-#
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_MEDIA_TUNER=y
 CONFIG_MEDIA_TUNER_SIMPLE=y
 CONFIG_MEDIA_TUNER_TDA18250=m
@@ -3763,6 +3756,11 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_I2C_NXP_TDA9950=m
+
+#
+# ARM devices
+#
+# CONFIG_DRM_KOMEDA is not set
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
@@ -3819,6 +3817,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_JDI_LT070ME05000=m
+CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
@@ -3831,6 +3830,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
+CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -3857,6 +3857,8 @@ CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_ARCPGU=m
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_MXS=y
@@ -4153,6 +4155,7 @@ CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=y
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
 CONFIG_HID_GYRATION=m
 # CONFIG_HID_ICADE is not set
 CONFIG_HID_ITE=m
@@ -4170,6 +4173,7 @@ CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIWHEELS_FF is not set
 # CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
 # CONFIG_HID_MAYFLASH is not set
 # CONFIG_HID_REDRAGON is not set
 CONFIG_HID_MICROSOFT=y
@@ -4248,6 +4252,7 @@ CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB_CBAF=m
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
@@ -4264,6 +4269,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_FSL=m
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
@@ -4627,6 +4633,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_88PM860X=m
 CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_DS1307=m
@@ -4668,8 +4675,10 @@ CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_SD3078=m
 
 #
 # SPI RTC drivers
@@ -4717,6 +4726,7 @@ CONFIG_RTC_DRV_ZYNQMP=m
 #
 # on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_CADENCE=m
 CONFIG_RTC_DRV_FTRTC010=m
 CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_MT6397=m
@@ -4747,6 +4757,7 @@ CONFIG_QCOM_HIDMA=m
 #
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
 
 #
 # DMABUF options
@@ -4825,6 +4836,7 @@ CONFIG_CLK_TWL6040=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_VC5=m
 CONFIG_COMMON_CLK_BD718XX=m
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_HWSPINLOCK=y
 
 #
@@ -4834,6 +4846,7 @@ CONFIG_MAILBOX=y
 # CONFIG_PLATFORM_MHU is not set
 CONFIG_ALTERA_MBOX=m
 # CONFIG_MAILBOX_TEST is not set
+CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 
@@ -4842,7 +4855,6 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMU_IOVA=y
 CONFIG_OF_IOMMU=y
 
 #
@@ -4913,13 +4925,13 @@ CONFIG_EXTCON_MAX77693=m
 CONFIG_EXTCON_MAX77843=m
 CONFIG_EXTCON_MAX8997=m
 CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_MEMORY=y
 CONFIG_IIO=m
 # CONFIG_IIO_BUFFER is not set
-CONFIG_IIO_TRIGGERED_BUFFER=m
 # CONFIG_IIO_CONFIGFS is not set
 # CONFIG_IIO_TRIGGER is not set
 # CONFIG_IIO_SW_DEVICE is not set
@@ -4957,6 +4969,7 @@ CONFIG_IIO_TRIGGERED_BUFFER=m
 # Analog to digital converters
 #
 # CONFIG_AD7291 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD799X is not set
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP288_ADC is not set
@@ -4977,6 +4990,7 @@ CONFIG_IIO_TRIGGERED_BUFFER=m
 # CONFIG_QCOM_SPMI_VADC is not set
 # CONFIG_QCOM_SPMI_ADC5 is not set
 # CONFIG_SD_ADC_MODULATOR is not set
+# CONFIG_STMPE_ADC is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TWL4030_MADC is not set
@@ -5000,6 +5014,8 @@ CONFIG_IIO_TRIGGERED_BUFFER=m
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
 # CONFIG_IAQCORE is not set
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SPS30 is not set
 # CONFIG_VZ89X is not set
 
 #
@@ -5114,6 +5130,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_LTR501 is not set
 # CONFIG_LV0104CS is not set
 # CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
 # CONFIG_OPT3001 is not set
 # CONFIG_PA12203001 is not set
 # CONFIG_SI1133 is not set
@@ -5234,8 +5251,10 @@ CONFIG_RESET_TI_SYSCON=m
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_PHY_CADENCE_DP=m
+CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
 CONFIG_PHY_PXA_28NM_HSIC=m
@@ -5282,11 +5301,13 @@ CONFIG_MULTIPLEXER=m
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
 
 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@@ -5294,8 +5315,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@@ -5428,7 +5447,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_RAM is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_EXOFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V2=m
@@ -5466,6 +5484,7 @@ CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -5558,6 +5577,7 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
 # CONFIG_SECURITY_YAMA is not set
+# CONFIG_SECURITY_SAFESETID is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -5565,7 +5585,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -5599,7 +5619,7 @@ CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
@@ -5816,7 +5836,20 @@ CONFIG_HAS_DMA=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_SWIOTLB=y
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
@@ -5850,6 +5883,7 @@ CONFIG_OBJAGG=m
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@@ -5865,7 +5899,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_PAGE_OWNER is not set
 CONFIG_DEBUG_FS=y
 CONFIG_HEADERS_CHECK=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
@@ -5881,6 +5914,7 @@ CONFIG_DEBUG_KERNEL=y
 #
 CONFIG_PAGE_EXTENSION=y
 # CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
 CONFIG_PAGE_POISONING=y
 CONFIG_PAGE_POISONING_NO_SANITY=y
 # CONFIG_PAGE_POISONING_ZERO is not set
@@ -5995,7 +6029,6 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
-# CONFIG_DMA_API_DEBUG is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -6020,6 +6053,7 @@ CONFIG_RBTREE_TEST=m
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_PARMAN is not set
 # CONFIG_TEST_LKM is not set
+# CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
@@ -6030,12 +6064,14 @@ CONFIG_RBTREE_TEST=m
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 # CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_IO_STRICT_DEVMEM=y

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 2147e2bc849e993d81486eb36a00d75cdec437ca..9cf2a8dc05530fbeb65ed7e12c1c560343869f96 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -23,9 +23,13 @@ CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 
 #
-# RCU Subsystem
+# Timers subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
+
+#
+# RCU Subsystem
+#
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -315,7 +319,6 @@ CONFIG_AMD_NB=y
 # Binary Emulations
 #
 CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
 # CONFIG_X86_X32 is not set
 CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
@@ -354,6 +357,7 @@ CONFIG_APPLE_PROPERTIES=y
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
 
 #
 # Tegra firmware driver
@@ -385,9 +389,9 @@ 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
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
 # GCOV-based kernel profiling
@@ -508,7 +512,6 @@ CONFIG_YENTA_TOSHIBA=y
 #
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
-# CONFIG_DMA_CMA is not set
 
 #
 # Bus devices
@@ -546,6 +549,7 @@ CONFIG_PVPANIC=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_INTEL_MEI_TXE=m
+# CONFIG_INTEL_MEI_HDCP is not set
 CONFIG_VMWARE_VMCI=m
 
 #
@@ -558,11 +562,6 @@ CONFIG_INTEL_MIC_BUS=m
 #
 # CONFIG_SCIF_BUS is not set
 
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
 #
 # VOP Driver
 #
@@ -585,7 +584,6 @@ CONFIG_SCSI_FLASHPOINT=y
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_ISCI=m
 CONFIG_ATA_ACPI=y
 # CONFIG_SATA_ZPODD is not set
@@ -1080,7 +1078,7 @@ CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA6752HS=m
 
 #
-# soc_camera sensor drivers
+# Miscellaneous helper chips
 #
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
@@ -1322,6 +1320,7 @@ CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
 CONFIG_EDAC_PND2=m
 CONFIG_RTC_MC146818_LIB=y
 
@@ -1341,11 +1340,6 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=y
 CONFIG_HSU_DMA=m
 
-#
-# DMA Clients
-#
-CONFIG_DMA_ENGINE_RAID=y
-
 #
 # DMABUF options
 #
@@ -1457,6 +1451,7 @@ CONFIG_INTEL_CHTDC_TI_PWRBTN=m
 # CONFIG_I2C_MULTI_INSTANTIATE is not set
 CONFIG_INTEL_ATOMISP2_PM=m
 CONFIG_HUAWEI_WMI=m
+CONFIG_PCENGINES_APU2=m
 CONFIG_PMC_ATOM=y
 # CONFIG_MELLANOX_PLATFORM is not set
 
@@ -1485,6 +1480,7 @@ CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
 
 #
 # Remoteproc drivers
@@ -1652,6 +1648,10 @@ CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_HAS_IOPORT_MAP=y
+
+#
+# Default contiguous memory area size:
+#
 CONFIG_IOMMU_HELPER=y
 CONFIG_UCS2_STRING=y
 CONFIG_ARCH_HAS_PMEM_API=y
@@ -1698,7 +1698,6 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_EARLY_PRINTK_USB_XDBC is not set
 CONFIG_X86_PTDUMP_CORE=y
 # CONFIG_X86_PTDUMP is not set

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index aa52df1b1f56bbe764972a134242f67e028485ab..4227cf77dea91c77cd93c94aaf76ae8e513efd23 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 5.0
-release    = 3
+version    = 5.1
+release    = 1
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>