diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 12e3827..0c7a725 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -4,18 +4,24 @@
 #
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
+
+#
+# end of IRQ subsystem
+#
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 
 #
-# RCU Subsystem
+# end of RCU Subsystem
 #
 CONFIG_GENERIC_SCHED_CLOCK=y
 
 #
-# Kernel Performance Events And Counters
+# end of General setup
 #
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_PGTABLE_LEVELS=2
 
@@ -33,11 +39,12 @@ CONFIG_ARCH_VEXPRESS=y
 # CONFIG_ARCH_ZX is not set
 
 #
-# ARM errata workarounds via the alternatives framework
+# end of ARM errata workarounds via the alternatives framework
 #
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_KUSER_HELPERS=y
 
 #
 # Boot options
@@ -70,16 +77,16 @@ CONFIG_QORIQ_CPUFREQ=m
 #
 # Firmware Drivers
 #
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_ARM_SCMI_POWER_DOMAIN=m
 CONFIG_ARM_SCPI_PROTOCOL=m
 CONFIG_ARM_SCPI_POWER_DOMAIN=m
 # CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 
 #
-# Tegra firmware driver
+# end of Firmware Drivers
 #
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
@@ -88,10 +95,16 @@ CONFIG_CRYPTO_NHPOLY1305_NEON=m
 # General architecture-dependent options
 #
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_CLONE_BACKWARDS=y
 
 #
-# Network testing
+# Memory Management options
+#
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+
+#
+# end of Networking options
 #
 # CONFIG_RFKILL_GPIO is not set
 
@@ -109,12 +122,12 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_PASID is not set
 
 #
-# PCI switch controller drivers
+# end of PCI switch controller drivers
 #
 # CONFIG_PCCARD is not set
 
 #
-# Firmware loader
+# end of Firmware loader
 #
 CONFIG_SOC_BUS=y
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
@@ -125,6 +138,10 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 CONFIG_VEXPRESS_CONFIG=y
+
+#
+# end of Bus devices
+#
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_RESERVED_MEM=y
 
@@ -147,7 +164,7 @@ CONFIG_VEXPRESS_SYSCFG=y
 # CONFIG_PVPANIC is not set
 
 #
-# SCSI Transports
+# end of SCSI Transports
 #
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
@@ -161,7 +178,7 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 # CONFIG_PATA_OF_PLATFORM is not set
 
 #
-# IEEE 1394 (FireWire) support
+# end of IEEE 1394 (FireWire) support
 #
 CONFIG_MII=y
 # CONFIG_ATM_LANAI is not set
@@ -172,7 +189,7 @@ CONFIG_MII=y
 # CONFIG_ATM_SOLOS is not set
 
 #
-# Distributed Switch Architecture drivers
+# end of Distributed Switch Architecture drivers
 #
 CONFIG_AMD8111_ETH=y
 # CONFIG_CHELSIO_T1_1G is not set
@@ -197,6 +214,7 @@ CONFIG_SMC91X=m
 CONFIG_DWMAC_MESON=m
 # CONFIG_STMMAC_PCI is not set
 # CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
 
 #
 # MII PHY device drivers
@@ -251,6 +269,10 @@ CONFIG_SERIAL_MESON=m
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
+
+#
+# end of Serial drivers
+#
 CONFIG_HW_RANDOM_MESON=y
 
 #
@@ -274,7 +296,7 @@ CONFIG_I2C_MESON=m
 CONFIG_I2C_VERSATILE=m
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+# end of PTP clock support
 #
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_MESON8_PMX=y
@@ -291,7 +313,7 @@ CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_TC3589X is not set
 
 #
-# USB GPIO expanders
+# end of USB GPIO expanders
 #
 CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_VEXPRESS=y
@@ -311,6 +333,8 @@ CONFIG_POWER_RESET_VEXPRESS=y
 #
 CONFIG_SENSORS_ARM_SCMI=m
 CONFIG_SENSORS_ARM_SCPI=m
+CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC=m
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_VEXPRESS=m
 
@@ -318,6 +342,7 @@ CONFIG_SENSORS_VEXPRESS=m
 # Watchdog Device Drivers
 #
 CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_IMX_SC_WDT=m
 CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_WATCHDOG=m
 
@@ -333,10 +358,14 @@ CONFIG_MESON_WATCHDOG=m
 # CONFIG_LPC_ICH is not set
 
 #
-# STMicroelectronics STMPE Interface Drivers
+# end of STMicroelectronics STMPE Interface Drivers
 #
 # CONFIG_MFD_VX855 is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
+
+#
+# end of Multifunction device drivers
+#
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
@@ -411,14 +440,24 @@ CONFIG_DRM_MALI_DISPLAY=m
 # Display Interface Bridges
 #
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+
+#
+# end of Display Interface Bridges
+#
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_PL111=m
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
 
 #
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_ARMCLCD is not set
+
+#
+# Backlight & LCD device support
+#
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
@@ -426,12 +465,12 @@ CONFIG_DRM_PL111=m
 # CONFIG_BACKLIGHT_LP8788 is not set
 
 #
-# Console display driver support
+# end of Graphics support
 #
 CONFIG_SND_DMAENGINE_PCM=m
 
 #
-# HD-Audio
+# end of HD-Audio
 #
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
@@ -448,10 +487,15 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+
+#
+# end of SoC Audio for Freescale CPUs
+#
 CONFIG_SND_I2S_HI6210_I2S=m
 # CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_MTK_BTCVSD=m
@@ -472,7 +516,12 @@ CONFIG_SND_MESON_AXG_SPDIFIN=m
 CONFIG_SND_MESON_AXG_PDM=m
 
 #
-# STMicroelectronics STM32 SOC audio support
+# end of ASoC support for Amlogic platforms
+#
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+
+#
+# end of STMicroelectronics STM32 SOC audio support
 #
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -618,11 +667,20 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
+
+#
+# end of CODEC drivers
+#
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
 
 #
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_MESON_G12A=m
+
+#
 # USB Physical Layer drivers
 #
 CONFIG_USB_ULPI=y
@@ -694,8 +752,11 @@ CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_TIMER_SP804=y
 CONFIG_CLKSRC_VERSATILE=y
+
+#
+# end of Clock Source drivers
+#
 CONFIG_ARM_MHU=m
 
 #
@@ -706,6 +767,10 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
+
+#
+# end of Generic IOMMU Pagetable Support
+#
 CONFIG_IOMMU_DMA=y
 
 #
@@ -728,7 +793,7 @@ CONFIG_ARM_PL172_MPMC=m
 CONFIG_MESON_SARADC=m
 
 #
-# Temperature sensors
+# end of Temperature sensors
 #
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
@@ -750,6 +815,10 @@ CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
 CONFIG_PARTITION_PERCPU=y
 CONFIG_MESON_IRQ_GPIO=y
+
+#
+# end of IRQ chip support
+#
 CONFIG_RESET_MESON=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 
@@ -759,6 +828,8 @@ CONFIG_RESET_MESON_AUDIO_ARB=m
 CONFIG_PHY_MESON8B_USB2=y
 CONFIG_PHY_MESON_GXL_USB2=y
 CONFIG_PHY_MESON_GXL_USB3=m
+CONFIG_PHY_MESON_G12A_USB2=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=y
 
 #
 # Performance monitor support
@@ -770,7 +841,7 @@ CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_PMU=y
 
 #
-# Android
+# end of Android
 #
 CONFIG_MESON_MX_EFUSE=m
 
@@ -783,6 +854,11 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_DMA_REMAP=y
 
 #
+# Compile-time checks and compiler options
+#
+# CONFIG_OPTIMIZE_INLINING is not set
+
+#
 # Memory Debugging
 #
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -796,6 +872,10 @@ CONFIG_DMA_REMAP=y
 # RCU Debugging
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
+
+#
+# end of RCU Debugging
+#
 # CONFIG_FTRACE_SYSCALLS is not set
 # 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 54f4a2e..f891ef6 100644
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -14,12 +14,12 @@ CONFIG_KERNEL_XZ=y
 CONFIG_CONTEXT_TRACKING_FORCE=y
 
 #
-# RCU Subsystem
+# end of RCU Subsystem
 #
 CONFIG_PERF_USE_VMALLOC=y
 
 #
-# Kernel Performance Events And Counters
+# end of General setup
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -62,6 +62,10 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
+
+#
+# end of Multiple platform selection
+#
 CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -110,12 +114,11 @@ CONFIG_SOC_EXYNOS5260=y
 CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5420=y
 CONFIG_SOC_EXYNOS5800=y
-# CONFIG_EXYNOS5420_MCPM is not set
 CONFIG_EXYNOS_CPU_SUSPEND=y
 CONFIG_PLAT_SAMSUNG=y
 
 #
-# Power management
+# end of Samsung Common options
 #
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HISI=y
@@ -127,6 +130,10 @@ CONFIG_ARCH_HI3xxx=y
 # CONFIG_ARCH_HIP01 is not set
 CONFIG_ARCH_HIP04=y
 CONFIG_ARCH_HIX5HD2=y
+
+#
+# end of Hisilicon platform type
+#
 CONFIG_ARCH_MXC=y
 
 #
@@ -174,6 +181,10 @@ 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
+
+#
+# end of TI OMAP Common Features
+#
 CONFIG_MACH_OMAP_GENERIC=y
 
 #
@@ -204,7 +215,15 @@ CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3_PANDORA=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
+
+#
+# end of TI OMAP2/3/4 Specific Features
+#
 CONFIG_OMAP5_ERRATA_801819=y
+
+#
+# end of TI OMAP/AM/DM/DRA Family
+#
 CONFIG_ARCH_SIRF=y
 
 #
@@ -251,13 +270,6 @@ CONFIG_ARCH_VT8500=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_PLAT_VERSATILE=y
-CONFIG_ARCH_SUPPORTS_FIRMWARE=y
-CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
-
-#
-# Firmware options
-#
-CONFIG_TRUSTED_FOUNDATIONS=y
 
 #
 # Processor Type
@@ -287,7 +299,6 @@ 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
 CONFIG_OUTER_CACHE_SYNC=y
@@ -319,6 +330,10 @@ CONFIG_ARM_ERRATA_821420=y
 CONFIG_ARM_ERRATA_825619=y
 CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
+
+#
+# end of System Type
+#
 CONFIG_KRAIT_L2_ACCESSORS=y
 
 #
@@ -397,6 +412,10 @@ CONFIG_ARM_HIGHBANK_CPUIDLE=y
 CONFIG_ARM_ZYNQ_CPUIDLE=y
 CONFIG_ARM_U8500_CPUIDLE=y
 CONFIG_ARM_EXYNOS_CPUIDLE=y
+
+#
+# end of ARM CPU Idle Drivers
+#
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -419,6 +438,7 @@ CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_32=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_TI_SCI_PROTOCOL=m
+CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_BCM47XX_NVRAM=y
 # CONFIG_BCM47XX_SPROM is not set
 # CONFIG_IMX_SCU is not set
@@ -427,6 +447,10 @@ CONFIG_BCM47XX_NVRAM=y
 # Tegra firmware driver
 #
 # CONFIG_TEGRA_IVC is not set
+
+#
+# end of Firmware Drivers
+#
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
@@ -455,10 +479,9 @@ CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 
 #
-# GCOV-based kernel profiling
+# GCC plugins
 #
 CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
-CONFIG_LBDAF=y
 
 #
 # Executable file formats
@@ -484,7 +507,7 @@ CONFIG_BOUNCE=y
 CONFIG_TEGRA_AHB=y
 
 #
-# Cadence PCIe controllers support
+# end of Cadence PCIe controllers support
 #
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
@@ -506,6 +529,7 @@ CONFIG_PCI_DRA7XX=y
 CONFIG_PCI_DRA7XX_HOST=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_KEYSTONE=y
+CONFIG_PCI_KEYSTONE_HOST=y
 CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_HISI_STB=y
@@ -514,6 +538,10 @@ CONFIG_PCIE_HISI_STB=y
 # Firmware loader
 #
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+
+#
+# end of Firmware loader
+#
 CONFIG_REGMAP_SPMI=m
 
 #
@@ -529,6 +557,10 @@ CONFIG_QCOM_EBI2=y
 CONFIG_SUNXI_RSB=m
 CONFIG_TEGRA_GMI=m
 CONFIG_TI_SYSC=y
+
+#
+# end of Bus devices
+#
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 
 #
@@ -539,14 +571,15 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_SRAM_EXEC=y
 
 #
-# VOP Driver
+# end of Misc devices
 #
 # CONFIG_IDE is not set
 
 #
-# SCSI Transports
+# end of SCSI Transports
 #
 CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SCSI_UFS_MEDIATEK=m
 # CONFIG_SCSI_UFS_HISI is not set
 CONFIG_SCSI_NSP32=m
 
@@ -572,7 +605,7 @@ CONFIG_SATA_HIGHBANK=m
 CONFIG_PATA_IMX=m
 
 #
-# Distributed Switch Architecture drivers
+# end of Distributed Switch Architecture drivers
 #
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
@@ -611,7 +644,6 @@ CONFIG_DWMAC_SUNXI=m
 CONFIG_DWMAC_SUN8I=m
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
-CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_CPSW=m
 # CONFIG_TI_CPTS is not set
 CONFIG_NET_VENDOR_XILINX=y
@@ -624,6 +656,7 @@ CONFIG_MDIO_SUN4I=m
 #
 # MII PHY device drivers
 #
+CONFIG_BCM_CYGNUS_PHY=m
 CONFIG_ATH10K_SNOC=m
 
 #
@@ -688,6 +721,10 @@ CONFIG_SERIAL_IMX=m
 CONFIG_SERIAL_OMAP=m
 CONFIG_SERIAL_BCM63XX=m
 CONFIG_SERIAL_ST_ASC=m
+
+#
+# end of Serial drivers
+#
 CONFIG_SERIAL_MCTRL_GPIO=m
 # CONFIG_HVC_DCC is not set
 CONFIG_HW_RANDOM_BCM2835=y
@@ -731,7 +768,7 @@ CONFIG_I2C_TEGRA=m
 CONFIG_I2C_WMT=m
 
 #
-# Other I2C/SMBus bus drivers
+# end of I2C support
 #
 CONFIG_SPMI_MSM_PMIC_ARB=m
 
@@ -746,7 +783,7 @@ CONFIG_OMAP_SSI=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+# end of PTP clock support
 #
 # CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_AMD=y
@@ -811,6 +848,11 @@ CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN8I_V3S=y
 CONFIG_PINCTRL_SUN9I_A80=y
 CONFIG_PINCTRL_SUN9I_A80_R=y
+CONFIG_PINCTRL_SUN50I_A64=y
+CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_H5=y
+CONFIG_PINCTRL_SUN50I_H6=y
+CONFIG_PINCTRL_SUN50I_H6_R=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
@@ -832,6 +874,10 @@ CONFIG_PINCTRL_MT7629=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
+
+#
+# end of MediaTek pinctrl drivers
+#
 CONFIG_PINCTRL_MESON8=y
 CONFIG_PINCTRL_MESON8B=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@@ -862,7 +908,7 @@ CONFIG_GPIO_TS4900=m
 # CONFIG_HTC_EGPIO is not set
 
 #
-# USB GPIO expanders
+# end of USB GPIO expanders
 #
 # CONFIG_ROCKCHIP_IODOMAIN is not set
 CONFIG_POWER_RESET_BRCMKONA=y
@@ -940,7 +986,7 @@ CONFIG_BCM47XX_WDT=m
 CONFIG_BCM7038_WDT=m
 
 #
-# Watchdog Pretimeout Governors
+# USB-based Watchdog Cards
 #
 CONFIG_SSB_HOST_SOC=y
 
@@ -963,7 +1009,7 @@ CONFIG_AB8500_CORE=y
 CONFIG_MFD_DB8500_PRCMU=y
 
 #
-# STMicroelectronics STMPE Interface Drivers
+# end of STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_OMAP_USB_HOST=y
@@ -971,6 +1017,10 @@ CONFIG_TWL4030_POWER=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
+
+#
+# end of Multifunction device drivers
+#
 CONFIG_REGULATOR_88PM8607=y
 # CONFIG_REGULATOR_AB8500 is not set
 CONFIG_REGULATOR_DBX500_PRCMU=y
@@ -1040,7 +1090,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
 
 #
-# AMD Library routines
+# end of Display Engine Configuration
 #
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_DRM_EXYNOS=m
@@ -1075,6 +1125,7 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RK3066_HDMI=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_SUN4I=m
@@ -1106,16 +1157,18 @@ CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 # OMAPDRM External Display Device Drivers
 #
 CONFIG_DRM_OMAP_ENCODER_OPA362=m
-CONFIG_DRM_OMAP_ENCODER_TFP410=m
 CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
-CONFIG_DRM_OMAP_CONNECTOR_DVI=m
 CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
 CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
-CONFIG_DRM_OMAP_PANEL_DPI=m
 CONFIG_DRM_OMAP_PANEL_DSI_CM=m
 CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
+
+#
+# end of OMAPDRM External Display Device Drivers
+#
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_GPU_SUDO is not set
 CONFIG_DRM_MSM_HDMI_HDCP=y
@@ -1136,6 +1189,10 @@ CONFIG_DRM_TEGRA=m
 #
 CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_DW_MIPI_DSI=m
+
+#
+# end of Display Interface Bridges
+#
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
 CONFIG_DRM_V3D=m
@@ -1158,7 +1215,7 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 # CONFIG_FB_MXS is not set
 
 #
-# Console display driver support
+# end of Graphics support
 #
 CONFIG_SND_ALS300=m
 # CONFIG_SND_ALI5451 is not set
@@ -1179,6 +1236,10 @@ CONFIG_SND_TRIDENT=m
 # HD-Audio
 #
 CONFIG_SND_HDA_TEGRA=m
+
+#
+# end of HD-Audio
+#
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 # CONFIG_SND_SOC_ADI is not set
@@ -1201,6 +1262,11 @@ CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_IMX_AUDMIX=m
+
+#
+# end of SoC Audio for Freescale CPUs
+#
 CONFIG_SND_SOC_MEDIATEK=m
 CONFIG_SND_SOC_MT2701=m
 CONFIG_SND_SOC_MT2701_CS42448=m
@@ -1212,9 +1278,11 @@ 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
+CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
+CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
 
 #
-# ASoC support for Amlogic platforms
+# end of ASoC support for Amlogic platforms
 #
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
@@ -1255,6 +1323,10 @@ CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
+
+#
+# end of Allwinner SoC Audio support
+#
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
 CONFIG_SND_SOC_XILINX_I2S=m
@@ -1269,6 +1341,10 @@ CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_WM8994=m
+
+#
+# end of CODEC drivers
+#
 CONFIG_SND_SYNTH_EMUX=m
 
 #
@@ -1337,7 +1413,6 @@ CONFIG_USB_TEGRA_PHY=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
@@ -1423,7 +1498,7 @@ CONFIG_MTK_CQDMA=m
 # CONFIG_DMA_OMAP is not set
 
 #
-# Xen driver support
+# end of Xen driver support
 #
 # CONFIG_MELLANOX_PLATFORM is not set
 
@@ -1473,6 +1548,11 @@ 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_MT8516=y
+
+#
+# end of Clock driver for MediaTek SoC
+#
 CONFIG_COMMON_CLK_MESON_INPUT=m
 CONFIG_COMMON_CLK_MESON8B=y
 CONFIG_KRAIT_CLOCKS=y
@@ -1503,6 +1583,7 @@ CONFIG_MSM_GCC_8998=m
 CONFIG_QCS_GCC_404=m
 CONFIG_SDM_CAMCC_845=m
 CONFIG_SDM_GCC_660=m
+CONFIG_QCS_TURING_404=m
 CONFIG_SDM_GCC_845=m
 CONFIG_SDM_GPUCC_845=m
 CONFIG_SDM_VIDEOCC_845=m
@@ -1514,6 +1595,11 @@ CONFIG_KPSS_XCC=m
 CONFIG_KRAITCC=m
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN4I_A10_CCU=y
 CONFIG_SUN5I_CCU=y
@@ -1530,6 +1616,10 @@ CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
 CONFIG_TEGRA_CLK_DFLL=y
 CONFIG_COMMON_CLK_TI_ADPLL=m
+
+#
+# end of Common Clock Framework
+#
 # CONFIG_HWSPINLOCK_OMAP is not set
 CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HWSPINLOCK_SIRF=m
@@ -1555,12 +1645,17 @@ CONFIG_PRIMA2_TIMER=y
 CONFIG_KEYSTONE_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_TIMER_SP804=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_EXYNOS_MCT=y
 CONFIG_CLKSRC_SAMSUNG_PWM=y
 CONFIG_MTK_TIMER=y
 CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_CLKSRC_ST_LPC=y
+
+#
+# end of Clock Source drivers
+#
 CONFIG_IMX_MBOX=m
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=m
@@ -1576,7 +1671,7 @@ CONFIG_BCM_PDC_MBOX=m
 CONFIG_MTK_CMDQ_MBOX=m
 
 #
-# Generic IOMMU Pagetable Support
+# end of Generic IOMMU Pagetable Support
 #
 CONFIG_OMAP_IOMMU=y
 # CONFIG_OMAP_IOMMU_DEBUG is not set
@@ -1585,6 +1680,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_TEGRA_IOMMU_SMMU is not set
 # CONFIG_EXYNOS_IOMMU is not set
 CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_MTK_IOMMU=y
 CONFIG_MTK_IOMMU_V1=y
 CONFIG_QCOM_IOMMU=y
@@ -1657,6 +1753,10 @@ CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMSM is not set
 # CONFIG_QCOM_WCNSS_CTRL is not set
 # CONFIG_QCOM_APR is not set
+
+#
+# end of Qualcomm SoC drivers
+#
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
@@ -1726,7 +1826,7 @@ CONFIG_SUN4I_GPADC=m
 # CONFIG_XILINX_XADC is not set
 
 #
-# Temperature sensors
+# end of Temperature sensors
 #
 # CONFIG_PWM_AB8500 is not set
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
@@ -1736,6 +1836,7 @@ CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_HIBVT=m
 CONFIG_PWM_IMX1=m
 CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
 # CONFIG_PWM_MTK_DISP is not set
 CONFIG_PWM_MEDIATEK=m
 CONFIG_PWM_OMAP_DMTIMER=m
@@ -1761,6 +1862,10 @@ CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
 # CONFIG_QCOM_PDC is not set
 CONFIG_IMX_IRQSTEER=y
+
+#
+# end of IRQ chip support
+#
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
 CONFIG_RESET_BRCMSTB=y
@@ -1781,6 +1886,7 @@ CONFIG_COMMON_RESET_HI6220=m
 CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_BCM_SR_USB=y
 CONFIG_PHY_BCM_NS_USB2=m
 CONFIG_PHY_BCM_NS_USB3=m
 CONFIG_PHY_NS2_PCIE=y
@@ -1792,6 +1898,7 @@ CONFIG_PHY_HIX5HD2_SATA=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_UFS=m
 CONFIG_PHY_MTK_XSPHY=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
@@ -1825,7 +1932,7 @@ CONFIG_TWL4030_USB=m
 CONFIG_PHY_TI_GMII_SEL=m
 
 #
-# Android
+# end of Android
 #
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
@@ -1838,7 +1945,7 @@ CONFIG_NVMEM_VF610_OCOTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 
 #
-# HW tracing support
+# end of HW tracing support
 #
 # CONFIG_TEE is not set
 
@@ -1877,7 +1984,6 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_SAHARA=m
-CONFIG_CRYPTO_DEV_MXC_SCC=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_UX500 is not set
@@ -1901,7 +2007,7 @@ CONFIG_STMP_DEVICE=y
 # CONFIG_DEBUG_HIGHMEM is not set
 
 #
-# RCU Debugging
+# end of RCU Debugging
 #
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_ARM_PTDUMP_CORE=y
diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index 87ef8d1..f1a037a 100644
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -6,7 +6,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
 
 #
-# RCU Subsystem
+# end of RCU Subsystem
 #
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -14,7 +14,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 
 #
-# Kernel Performance Events And Counters
+# end of General setup
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -34,6 +34,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 #
 # Platform selection
 #
+# CONFIG_ARCH_AGILEX is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BERLIN is not set
@@ -72,9 +73,10 @@ CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1188873=y
+CONFIG_ARM64_ERRATUM_1418040=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1286807=y
+CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -88,6 +90,10 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_HISILICON_ERRATUM_161600802 is not set
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_FUJITSU_ERRATUM_010001=y
+
+#
+# end of ARM errata workarounds via the alternatives framework
+#
 # CONFIG_ARM64_4K_PAGES is not set
 # CONFIG_ARM64_16K_PAGES is not set
 CONFIG_ARM64_64K_PAGES=y
@@ -117,11 +123,12 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
+CONFIG_ARM64_SW_TTBR0_PAN=y
+CONFIG_COMPAT=y
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
 
 #
 # ARMv8.1 architectural features
@@ -143,9 +150,12 @@ CONFIG_ARM64_CNP=y
 # ARMv8.3 architectural features
 #
 CONFIG_ARM64_PTR_AUTH=y
+
+#
+# end of ARMv8.3 architectural features
+#
 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
@@ -158,7 +168,10 @@ CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
 CONFIG_DMI=y
-CONFIG_COMPAT=y
+
+#
+# end of Boot options
+#
 CONFIG_SYSVIPC_COMPAT=y
 
 #
@@ -190,10 +203,14 @@ 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
+
+#
+# end of EFI (Extensible Firmware Interface) Support
+#
 CONFIG_EFI_EARLYCON=y
 
 #
-# Tegra firmware driver
+# end of Firmware Drivers
 #
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
@@ -223,6 +240,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_BGRT is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
 # CONFIG_ACPI_NFIT is not set
+# CONFIG_ACPI_HMAT is not set
 # CONFIG_ACPI_APEI is not set
 CONFIG_ACPI_WATCHDOG=y
 # CONFIG_PMIC_OPREGION is not set
@@ -270,20 +288,12 @@ CONFIG_VMAP_STACK=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
-# GCOV-based kernel profiling
-#
-CONFIG_GCC_PLUGIN_STACKLEAK=y
-CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
-# CONFIG_STACKLEAK_METRICS is not set
-# CONFIG_STACKLEAK_RUNTIME_DISABLE is not set
-
-#
-# Partition Types
+# end of Partition Types
 #
 CONFIG_BLOCK_COMPAT=y
 
 #
-# IO Schedulers
+# end of IO Schedulers
 #
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
@@ -360,6 +370,10 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+
+#
+# end of Memory Management options
+#
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
@@ -370,7 +384,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=y
 
 #
-# Cadence PCIe controllers support
+# end of Cadence PCIe controllers support
 #
 CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_XGENE=y
@@ -391,9 +405,18 @@ CONFIG_PCI_HISI=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 
 #
+# end of Firmware loader
+#
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+
+#
 # Bus devices
 #
 # CONFIG_BRCMSTB_GISB_ARB is not set
+
+#
+# end of Bus devices
+#
 CONFIG_OF_NUMA=y
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
@@ -405,15 +428,19 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV_SKD=m
 
 #
-# VOP Driver
+# end of Intel MIC & related support
 #
 # CONFIG_GENWQE is not set
 
 #
-# SCSI Transports
+# end of SCSI Transports
 #
 CONFIG_SCSI_HISI_SAS=m
 CONFIG_SCSI_HISI_SAS_PCI=m
+
+#
+# end of SCSI device support
+#
 CONFIG_ATA_ACPI=y
 CONFIG_SATA_ZPODD=y
 
@@ -429,12 +456,13 @@ CONFIG_SATA_AHCI_SEATTLE=m
 CONFIG_PATA_ACPI=m
 
 #
-# Distributed Switch Architecture drivers
+# end of Distributed Switch Architecture drivers
 #
 CONFIG_VORTEX=m
 CONFIG_AMD_XGBE=m
 CONFIG_NET_XGENE=m
 CONFIG_NET_XGENE_V2=m
+CONFIG_AQTION=m
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MACB_PCI=m
@@ -472,7 +500,7 @@ CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_SERIAL_8250_PNP=y
 
 #
-# Non-8250 serial port support
+# end of Serial drivers
 #
 CONFIG_HVC_DCC=y
 CONFIG_IPMI_DMI_DECODE=y
@@ -486,6 +514,11 @@ CONFIG_HW_RANDOM_OPTEE=m
 CONFIG_ACPI_I2C_OPREGION=y
 
 #
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_AMD_MP2=m
+
+#
 # ACPI drivers
 #
 CONFIG_I2C_SCMI=m
@@ -505,7 +538,7 @@ CONFIG_I2C_THUNDERX=m
 CONFIG_I2C_XGENE_SLIMPRO=m
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+# end of PTP clock support
 #
 CONFIG_PINCTRL_AS3722=m
 CONFIG_PINCTRL_AMD=m
@@ -534,13 +567,19 @@ CONFIG_GPIO_XILINX=m
 # CONFIG_GPIO_TPS68470 is not set
 
 #
-# USB GPIO expanders
+# PCI GPIO expanders
+#
+CONFIG_GPIO_MLXBF=m
+
+#
+# end of USB GPIO expanders
 #
 CONFIG_POWER_RESET_XGENE=y
 
 #
 # Native drivers
 #
+CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_XGENE=m
 
 #
@@ -552,6 +591,7 @@ CONFIG_SENSORS_ACPI_POWER=m
 # Watchdog Device Drivers
 #
 CONFIG_WDAT_WDT=m
+CONFIG_MLX_WDT=m
 CONFIG_ARM_SBSA_WATCHDOG=m
 
 #
@@ -561,9 +601,13 @@ CONFIG_ARM_SBSA_WATCHDOG=m
 # CONFIG_ABX500_CORE is not set
 
 #
-# STMicroelectronics STMPE Interface Drivers
+# end of STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_MFD_TPS68470=y
+
+#
+# end of Multifunction device drivers
+#
 # CONFIG_REGULATOR_88PM8607 is not set
 # CONFIG_REGULATOR_GPIO is not set
 CONFIG_REGULATOR_HI6421V530=m
@@ -576,12 +620,13 @@ CONFIG_REGULATOR_HI6421V530=m
 # CONFIG_IR_NUVOTON is not set
 
 #
-# Display Engine Configuration
+# end of Display Engine Configuration
 #
 # CONFIG_HSA_AMD is not set
+CONFIG_DRM_RCAR_WRITEBACK=y
 
 #
-# Display Interface Bridges
+# end of Display Interface Bridges
 #
 CONFIG_DRM_HISI_KIRIN=m
 CONFIG_HISI_KIRIN_DW_DSI=m
@@ -597,10 +642,14 @@ CONFIG_FB_EFI=y
 #
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
+
+#
+# end of Graphics support
+#
 # CONFIG_SND_LX6464ES is not set
 
 #
-# HD-Audio
+# end of HD-Audio
 #
 # CONFIG_SND_DESIGNWARE_PCM is not set
 
@@ -610,7 +659,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_SND_SOC_FSL_MICFIL=m
 
 #
-# STMicroelectronics STM32 SOC audio support
+# end of STMicroelectronics STM32 SOC audio support
 #
 # CONFIG_SND_SOC_XILINX_I2S is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
@@ -663,6 +712,14 @@ CONFIG_XGENE_DMA=m
 CONFIG_XEN_EFI=y
 
 #
+# end of Xen driver support
+#
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_MLXBF_TMFIFO=m
+
+#
 # Common Clock Framework
 #
 CONFIG_COMMON_CLK_XGENE=y
@@ -683,12 +740,16 @@ CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
+
+#
+# end of Clock Source drivers
+#
 # CONFIG_PL320_MBOX is not set
 CONFIG_PCC=y
 CONFIG_XGENE_SLIMPRO_MBOX=m
 
 #
-# Generic IOMMU Pagetable Support
+# end of Generic IOMMU Pagetable Support
 #
 # CONFIG_ARM_SMMU is not set
 CONFIG_ARM_SMMU_V3=y
@@ -723,13 +784,14 @@ CONFIG_PHY_XGENE=m
 # Performance monitor support
 #
 CONFIG_ARM_PMU_ACPI=y
+CONFIG_ARM_SMMU_V3_PMU=m
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_HISI_PMU is not set
 CONFIG_XGENE_PMU=y
 # CONFIG_ARM_SPE_PMU is not set
 
 #
-# Android
+# end of Android
 #
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
@@ -744,6 +806,10 @@ CONFIG_DAX_DRIVER=y
 # HW tracing support
 #
 # CONFIG_INTEL_TH_ACPI is not set
+
+#
+# end of HW tracing support
+#
 CONFIG_TEE=m
 
 #
@@ -776,6 +842,18 @@ CONFIG_EFIVAR_FS=y
 # Security options
 #
 CONFIG_KEYS_COMPAT=y
+
+#
+# Memory initialization
+#
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+# CONFIG_STACKLEAK_RUNTIME_DISABLE is not set
+
+#
+# end of Security options
+#
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 
@@ -800,6 +878,7 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
 CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
 CONFIG_DMA_DIRECT_REMAP=y
@@ -824,7 +903,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_KASAN is not set
 
 #
-# RCU Debugging
+# end of RCU Debugging
 #
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_HIST_TRIGGERS is not set
diff --git a/kernel/config-generic b/kernel/config-generic
index fcda84c..9118afc 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -46,6 +46,8 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -62,6 +64,8 @@ CONFIG_NO_HZ_FULL=y
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -81,6 +85,8 @@ CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_PSI=y
 # CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -93,7 +99,10 @@ CONFIG_TREE_SRCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_NOCB_CPU=y
+# end of RCU Subsystem
+
 # CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
@@ -137,7 +146,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_BPF=y
 CONFIG_EXPERT=y
@@ -182,6 +190,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
@@ -191,16 +201,17 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_MMU=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -222,6 +233,8 @@ CONFIG_SCHED_MC=y
 #
 # Performance monitoring
 #
+# end of Performance monitoring
+
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -230,6 +243,8 @@ CONFIG_HZ_300=y
 CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_HOTPLUG_CPU=y
+# end of Processor type and features
+
 
 #
 # Power management and ACPI options
@@ -273,6 +288,7 @@ CONFIG_CPUFREQ_DT_PLATDEV=y
 #
 # shared options
 #
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -281,14 +297,20 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
+# end of CPU Idle
+
+# end of Power management and ACPI options
 
 #
 # Bus options (PCI etc.)
 #
+# end of Bus options (PCI etc.)
 
 #
 # Binary Emulations
 #
+# end of Binary Emulations
+
 
 #
 # Firmware Drivers
@@ -298,10 +320,15 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # EFI (Extensible Firmware Interface) Support
 #
+# end of EFI (Extensible Firmware Interface) Support
+
 
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 CONFIG_VIRTUALIZATION=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_VSOCK=m
@@ -345,30 +372,36 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_64BIT_TIME=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
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
 # 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
 CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -421,6 +454,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
@@ -432,6 +467,8 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# end of IO Schedulers
+
 CONFIG_PADATA=y
 CONFIG_ASN1=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -454,6 +491,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -464,6 +502,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
@@ -482,6 +521,8 @@ CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@@ -539,9 +580,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -580,10 +618,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SIT_6RD is not set
@@ -651,7 +685,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -719,6 +752,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
@@ -772,6 +806,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -846,7 +882,6 @@ CONFIG_NF_DEFRAG_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
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -863,6 +898,7 @@ CONFIG_NF_NAT_H323=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -870,7 +906,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -879,6 +914,8 @@ CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 # CONFIG_IP6_NF_IPTABLES is not set
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_TABLES_BRIDGE=y
 CONFIG_NFT_BRIDGE_REJECT=m
@@ -910,17 +947,21 @@ 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_8021Q=y
+CONFIG_NET_DSA_TAG_BRCM_COMMON=y
 CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
+CONFIG_NET_DSA_TAG_GSWIP=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
+CONFIG_NET_DSA_TAG_MTK=y
+CONFIG_NET_DSA_TAG_KSZ_COMMON=y
 CONFIG_NET_DSA_TAG_KSZ=y
 CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_LAN9303=y
-CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_LAN9303=y
+CONFIG_NET_DSA_TAG_SJA1105=y
+CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_VLAN_8021Q=y
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_VLAN_8021Q_MVRP is not set
@@ -1052,6 +1093,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_BT is not set
@@ -1152,6 +1196,8 @@ CONFIG_HOTPLUG_PCI_SHPC=y
 #
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
+# end of Cadence PCIe controllers support
+
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_XILINX=y
@@ -1164,16 +1210,21 @@ CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
 
 #
 # PC-card bridges
@@ -1195,6 +1246,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 # CONFIG_ALLOW_DEV_COREDUMP is not set
 # CONFIG_DEBUG_DRIVER is not set
@@ -1209,11 +1262,14 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 # CONFIG_SIMPLE_PM_BUS is not set
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 # CONFIG_GNSS is not set
@@ -1267,6 +1323,7 @@ CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -1300,6 +1357,8 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_IDT_89HPESX=m
 # CONFIG_EEPROM_EE1004 is not set
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1308,6 +1367,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 # CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_ALTERA_STAPL=m
 
@@ -1347,11 +1408,15 @@ CONFIG_ALTERA_STAPL=m
 #
 # VOP Driver
 #
+# end of Intel MIC & related support
+
 # CONFIG_ECHO is not set
 CONFIG_MISC_ALCOR_PCI=m
 # CONFIG_MISC_RTSX_PCI is not set
 CONFIG_MISC_RTSX_USB=m
 # CONFIG_HABANA_AI is not set
+# end of Misc devices
+
 
 #
 # SCSI device support
@@ -1389,6 +1454,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -1477,6 +1544,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -1609,6 +1678,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 # CONFIG_DM_DELAY is not set
+# CONFIG_DM_DUST is not set
 # CONFIG_DM_INIT is not set
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_FLAKEY is not set
@@ -1625,6 +1695,8 @@ CONFIG_DM_INTEGRITY=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
@@ -1678,6 +1750,7 @@ CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
 CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
 CONFIG_NET_DSA_MV88E6XXX=y
@@ -1688,6 +1761,8 @@ CONFIG_NET_DSA_REALTEK_SMI=m
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
 CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -1908,7 +1983,6 @@ 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
 CONFIG_VIA_RHINE=m
@@ -1943,7 +2017,7 @@ CONFIG_LED_TRIGGER_PHY=y
 CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
-CONFIG_ASIX_PHY=m
+CONFIG_AX88796B_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
@@ -2140,6 +2214,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -2153,6 +2229,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -2199,6 +2277,7 @@ CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2251,6 +2330,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 # CONFIG_RSI_DEBUGFS is not set
@@ -2317,6 +2403,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1050 is not set
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -2357,10 +2444,12 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
 # CONFIG_INPUT_MSM_VIBRATOR is not set
+# CONFIG_INPUT_MAX77650_ONKEY is not set
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
 # CONFIG_INPUT_KXTJ9 is not set
@@ -2414,10 +2503,11 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_PS2MULT is not set
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
 # CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -2437,6 +2527,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
+# CONFIG_NULL_TTY is not set
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 
@@ -2469,6 +2560,7 @@ CONFIG_SERIAL_8250_MOXA=m
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SC16IS7XX_CORE=m
 CONFIG_SERIAL_SC16IS7XX=m
 CONFIG_SERIAL_SC16IS7XX_I2C=y
@@ -2476,6 +2568,8 @@ CONFIG_SERIAL_SC16IS7XX_I2C=y
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
+# end of Serial drivers
+
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_HVC_DRIVER=y
@@ -2500,6 +2594,8 @@ CONFIG_MAX_RAW_DEVS=8192
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+# end of Character devices
+
 
 #
 # I2C support
@@ -2522,6 +2618,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -2577,12 +2675,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 # Other I2C/SMBus bus drivers
 #
+# end of I2C Hardware Bus support
+
 CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_SLAVE_EEPROM is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -2621,6 +2723,8 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -2630,6 +2734,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_STMFX is not set
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_OCELOT is not set
@@ -2652,14 +2757,15 @@ CONFIG_GPIO_EXAR=m
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_HLWD is not set
 CONFIG_GPIO_MB86S7X=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # Port-mapped I/O GPIO drivers
 #
+# end of Port-mapped I/O GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -2672,6 +2778,7 @@ CONFIG_GPIO_GW_PLD=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -2683,6 +2790,7 @@ CONFIG_GPIO_TPIC2810=m
 # CONFIG_GPIO_KEMPLD is not set
 # CONFIG_GPIO_LP3943 is not set
 CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_PALMAS is not set
 # CONFIG_GPIO_RC5T583 is not set
 CONFIG_GPIO_STMPE=y
@@ -2697,6 +2805,7 @@ CONFIG_GPIO_TPS65218=m
 # CONFIG_GPIO_WM831X is not set
 # CONFIG_GPIO_WM8350 is not set
 # CONFIG_GPIO_WM8994 is not set
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -2705,11 +2814,15 @@ CONFIG_GPIO_TPS65218=m
 CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_PCIE_IDIO_24=m
 # CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 # CONFIG_W1 is not set
 CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET=y
@@ -2746,9 +2859,10 @@ CONFIG_AXP288_FUEL_GAUGE=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LTC3651 is not set
+# CONFIG_CHARGER_LT3651 is not set
 CONFIG_CHARGER_MAX14577=m
 CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_MAX77693=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -2760,6 +2874,7 @@ CONFIG_CHARGER_MAX77693=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_UCS1002 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2850,14 +2965,14 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC=y
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_ISL68137 is not set
 CONFIG_SENSORS_LM25066=m
 # CONFIG_SENSORS_LTC2978 is not set
 CONFIG_SENSORS_LTC3815=m
@@ -2941,6 +3056,7 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CLOCK_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=y
 CONFIG_MAX77620_THERMAL=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_DA9062_THERMAL=m
@@ -2952,6 +3068,10 @@ CONFIG_DA9062_THERMAL=m
 #
 # ACPI INT340X thermal drivers
 #
+# end of ACPI INT340X thermal drivers
+
+# end of Intel thermal drivers
+
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
@@ -2960,6 +3080,11 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 CONFIG_WATCHDOG_SYSFS=y
 
 #
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
@@ -2995,11 +3120,6 @@ CONFIG_XEN_WDT=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -3060,6 +3180,7 @@ CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_MAX14577=y
 CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=y
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MAX77843=y
@@ -3090,6 +3211,8 @@ CONFIG_MFD_STMPE=y
 # STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_STMPE_I2C=y
+# end of STMicroelectronics STMPE Interface Drivers
+
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 CONFIG_MFD_LP3943=m
@@ -3127,6 +3250,9 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=y
 CONFIG_MFD_ROHM_BD718XX=m
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_88PG86X=m
@@ -3162,6 +3288,7 @@ CONFIG_REGULATOR_LTC3589=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
@@ -3257,7 +3384,7 @@ CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_DVB=y
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
@@ -3551,6 +3678,10 @@ CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
+# Lens drivers
+#
+
+#
 # Flash devices
 #
 
@@ -3747,6 +3878,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_TTM=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -3756,11 +3888,14 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
 # CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
@@ -3773,20 +3908,17 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
@@ -3795,8 +3927,11 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 #
 # drm/i915 Debugging
 #
+# end of drm/i915 Debugging
+
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
@@ -3814,6 +3949,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -3823,6 +3959,8 @@ CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
+# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
@@ -3832,6 +3970,8 @@ 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
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -3857,6 +3997,8 @@ CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_ARCPGU=m
@@ -3866,7 +4008,12 @@ CONFIG_DRM_MXSFB=m
 CONFIG_DRM_TINYDRM=m
 CONFIG_DRM_XEN=y
 CONFIG_DRM_XEN_FRONTEND=m
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_VIA is not set
+# CONFIG_DRM_SAVAGE is not set
 
 #
 # Frame buffer Devices
@@ -3928,7 +4075,11 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -3951,6 +4102,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -3962,10 +4115,14 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -4094,10 +4251,13 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
@@ -4137,6 +4297,7 @@ CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
 CONFIG_HID_CORSAIR=m
 # CONFIG_HID_COUGAR is not set
+# CONFIG_HID_MACALLY is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CMEDIA is not set
 CONFIG_HID_CP2112=m
@@ -4210,6 +4371,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_UDRAW_PS3 is not set
+# CONFIG_HID_U2FZERO is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_XINMO is not set
@@ -4218,6 +4380,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_ALPS is not set
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -4225,15 +4388,20 @@ CONFIG_HID_SENSOR_HUB=m
 CONFIG_USB_HID=y
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
 
 #
 # Intel ISH HID support
 #
+# end of Intel ISH HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -4464,6 +4632,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 # CONFIG_USB_GADGET is not set
 CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
@@ -4477,11 +4647,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
@@ -4500,6 +4674,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 #
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
@@ -4537,6 +4712,7 @@ CONFIG_LEDS_AS3645A=m
 CONFIG_LEDS_BCM6328=m
 CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 CONFIG_LEDS_LM3692X=m
@@ -4567,6 +4743,7 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_ADP5520=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
 CONFIG_LEDS_MAX77693=m
 CONFIG_LEDS_MAX8997=m
 CONFIG_LEDS_LM355x=m
@@ -4765,6 +4942,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_UDMABUF is not set
+# end of DMABUF options
+
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 # CONFIG_UIO_CIF is not set
@@ -4790,6 +4969,7 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
 
 #
 # Xen driver support
@@ -4812,6 +4992,8 @@ CONFIG_XEN_PVCALLS_FRONTEND=m
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_AUTO_XLATE=y
 CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+# end of Xen driver support
+
 # CONFIG_STAGING is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@@ -4837,11 +5019,15 @@ CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_VC5=m
 CONFIG_COMMON_CLK_BD718XX=m
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# end of Common Clock Framework
+
 CONFIG_HWSPINLOCK=y
 
 #
 # Clock Source drivers
 #
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 # CONFIG_PLATFORM_MHU is not set
 CONFIG_ALTERA_MBOX=m
@@ -4853,6 +5039,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -4860,6 +5048,7 @@ CONFIG_OF_IOMMU=y
 #
 # Remoteproc drivers
 #
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -4868,6 +5057,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -4877,28 +5068,49 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
+
+#
+# IXP4xx SoC drivers
+#
+# CONFIG_IXP4XX_QMGR is not set
+# CONFIG_IXP4XX_NPE is not set
+# end of IXP4xx SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -4964,6 +5176,7 @@ CONFIG_IIO=m
 # CONFIG_MXC6255 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -4997,15 +5210,18 @@ CONFIG_IIO=m
 # CONFIG_TWL6030_GPADC is not set
 # CONFIG_VF610_ADC is not set
 # CONFIG_VIPERBOARD_ADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 # CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -5017,19 +5233,18 @@ CONFIG_IIO=m
 # CONFIG_SENSIRION_SGP30 is not set
 # CONFIG_SPS30 is not set
 # CONFIG_VZ89X is not set
+# end of Chemical Sensors
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
+# end of Hid Sensor IIO Common
 
 #
 # SSP Sensor Common
 #
-
-#
-# Counters
-#
+# end of SSP Sensor Common
 
 #
 # Digital to analog converters
@@ -5047,10 +5262,12 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_MCP4725 is not set
 # CONFIG_TI_DAC5571 is not set
 # CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
 #
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -5059,19 +5276,24 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 #
 # Clock Generator/Distribution
 #
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
 #
 # CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
 # CONFIG_HID_SENSOR_GYRO_3D is not set
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -5083,6 +5305,8 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_AFE4404 is not set
 # CONFIG_MAX30100 is not set
 # CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -5095,6 +5319,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
 # CONFIG_SI7020 is not set
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -5103,6 +5328,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_KMX61 is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
 
 #
 # Light sensors
@@ -5149,6 +5375,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_VEML6070 is not set
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -5163,17 +5390,20 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_RM3100_I2C is not set
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 # CONFIG_IIO_MUX is not set
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 # CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
 # CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
 
 #
 # Digital potentiometers
@@ -5183,11 +5413,13 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_MCP4018 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_TPL0102 is not set
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 # CONFIG_LMP91000 is not set
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -5204,25 +5436,30 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
 # CONFIG_ZPA2326 is not set
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 # CONFIG_ISL29501 is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 # CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -5234,6 +5471,8 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_TMP007 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
+# end of Temperature sensors
+
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 
@@ -5242,6 +5481,8 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 #
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
+# end of IRQ chip support
+
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_TI_SYSCON=m
@@ -5266,20 +5507,27 @@ CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_DAX=y
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -5291,6 +5539,8 @@ CONFIG_INTEL_TH_GTH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
 CONFIG_MULTIPLEXER=m
@@ -5298,10 +5548,14 @@ CONFIG_MULTIPLEXER=m
 #
 # Multiplexer drivers
 #
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 # CONFIG_INTERCONNECT is not set
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -5375,6 +5629,7 @@ CONFIG_FSCACHE_STATS=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -5383,6 +5638,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -5394,6 +5650,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_FAT_DEFAULT_UTF8=y
 # CONFIG_NTFS_FS is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -5409,6 +5666,8 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=m
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
@@ -5551,6 +5810,8 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+# CONFIG_UNICODE is not set
+# end of File systems
 
 #
 # Security options
@@ -5586,6 +5847,24 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# 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
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -5613,9 +5892,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=m
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=m
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
@@ -5632,6 +5908,15 @@ CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=m
 
 #
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
 # Authenticated Encryption with Associated Data
 #
 CONFIG_CRYPTO_CCM=m
@@ -5765,6 +6050,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5772,11 +6059,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+# CONFIG_PACKING is not set
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=y
@@ -5858,7 +6147,6 @@ CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
 # CONFIG_DDR is not set
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
@@ -5873,6 +6161,8 @@ CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
 CONFIG_OBJAGG=m
 
 #
@@ -5889,6 +6179,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -5904,10 +6195,13 @@ CONFIG_HEADERS_CHECK=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -5931,6 +6225,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -5941,6 +6237,8 @@ CONFIG_DEBUG_SHIRQ=y
 #
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=120
@@ -5966,12 +6264,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -5983,6 +6283,8 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -6028,7 +6330,6 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -6041,6 +6342,7 @@ CONFIG_RBTREE_TEST=m
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -6076,3 +6378,4 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# end of Kernel hacking
diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 9cf2a8d..87c89cd 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -16,6 +16,10 @@ CONFIG_KERNEL_XZ=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+
+#
+# end of IRQ subsystem
+#
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
@@ -28,7 +32,7 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CONTEXT_TRACKING_FORCE=y
 
 #
-# RCU Subsystem
+# end of RCU Subsystem
 #
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
@@ -39,7 +43,7 @@ CONFIG_PCSPKR_PLATFORM=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 
 #
-# Kernel Performance Events And Counters
+# end of General setup
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -63,7 +67,6 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ZONE_DMA32=y
 CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_64_SMP=y
 CONFIG_PGTABLE_LEVELS=4
@@ -89,7 +92,6 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT_XXL=y
 # CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_QUEUED_LOCK_STAT is not set
 CONFIG_XEN_PV=y
 CONFIG_XEN_PV_SMP=y
 CONFIG_XEN_PVHVM=y
@@ -149,6 +151,10 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=y
 CONFIG_PERF_EVENTS_INTEL_CSTATE=y
 CONFIG_PERF_EVENTS_AMD_POWER=m
+
+#
+# end of Performance monitoring
+#
 CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=y
@@ -209,6 +215,10 @@ CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_MODIFY_LDT_SYSCALL is not set
+
+#
+# end of Processor type and features
+#
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -264,6 +274,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 # CONFIG_ACPI_NFIT is not set
+# CONFIG_ACPI_HMAT is not set
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
@@ -298,7 +309,7 @@ CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_SPEEDSTEP_LIB=m
 
 #
-# CPU Idle
+# end of CPU Idle
 #
 CONFIG_INTEL_IDLE=y
 
@@ -324,6 +335,10 @@ CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
+
+#
+# end of Binary Emulations
+#
 CONFIG_X86_DEV_DMA_OPS=y
 
 #
@@ -354,13 +369,17 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
 # CONFIG_EFI_TEST is not set
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
+
+#
+# end of EFI (Extensible Firmware Interface) Support
+#
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
 CONFIG_EFI_EARLYCON=y
 
 #
-# Tegra firmware driver
+# end of Firmware Drivers
 #
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
@@ -380,6 +399,7 @@ CONFIG_HOTPLUG_SMT=y
 CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
@@ -394,20 +414,12 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
-# GCOV-based kernel profiling
-#
-CONFIG_GCC_PLUGIN_STACKLEAK=y
-CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
-# CONFIG_STACKLEAK_METRICS is not set
-# CONFIG_STACKLEAK_RUNTIME_DISABLE is not set
-
-#
-# Partition Types
+# end of Partition Types
 #
 CONFIG_BLOCK_COMPAT=y
 
 #
-# IO Schedulers
+# end of IO Schedulers
 #
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
@@ -432,7 +444,6 @@ CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
@@ -448,9 +459,14 @@ CONFIG_THP_SWAP=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_HMM_MIRROR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+
+#
+# end of Memory Management options
+#
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
@@ -460,7 +476,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_HYPERV_VSOCKETS=m
 
 #
-# Network testing
+# end of Networking options
 #
 CONFIG_RFKILL_GPIO=m
 
@@ -485,13 +501,13 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
-# Cadence PCIe controllers support
+# end of Cadence PCIe controllers support
 #
 CONFIG_PCI_FTPCI100=y
 CONFIG_VMD=m
 
 #
-# PCI switch controller drivers
+# end of PCI switch controller drivers
 #
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA is not set
@@ -511,10 +527,14 @@ CONFIG_YENTA_TOSHIBA=y
 # Firmware loader
 #
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+
+#
+# end of Firmware loader
+#
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 
 #
-# Bus devices
+# end of Bus devices
 #
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PNP=y
@@ -544,7 +564,7 @@ CONFIG_VMWARE_BALLOON=m
 CONFIG_PVPANIC=m
 
 #
-# Texas Instruments shared transport line discipline
+# end of Texas Instruments shared transport line discipline
 #
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
@@ -563,13 +583,17 @@ CONFIG_INTEL_MIC_BUS=m
 # CONFIG_SCIF_BUS is not set
 
 #
-# VOP Driver
+# end of Intel MIC & related support
 #
 # CONFIG_GENWQE is not set
+
+#
+# end of Misc devices
+#
 # CONFIG_IDE is not set
 
 #
-# SCSI Transports
+# end of SCSI Transports
 #
 CONFIG_AIC79XX_RESET_DELAY_MS=4000
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
@@ -585,6 +609,10 @@ CONFIG_VMWARE_PVSCSI=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_ISCI=m
+
+#
+# end of SCSI device support
+#
 CONFIG_ATA_ACPI=y
 # CONFIG_SATA_ZPODD is not set
 
@@ -599,7 +627,7 @@ CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_ACPI=m
 
 #
-# IEEE 1394 (FireWire) support
+# end of IEEE 1394 (FireWire) support
 #
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MII=m
@@ -623,7 +651,7 @@ CONFIG_ATM_HE=m
 CONFIG_ATM_SOLOS=m
 
 #
-# Distributed Switch Architecture drivers
+# end of Distributed Switch Architecture drivers
 #
 CONFIG_VORTEX=m
 CONFIG_AMD8111_ETH=m
@@ -664,6 +692,8 @@ CONFIG_8139TOO_8129=y
 CONFIG_SFC_SRIOV=y
 CONFIG_STMMAC_PCI=m
 CONFIG_VIA_RHINE_MMIO=y
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_NET_SB1000=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_CAVIUM=m
@@ -745,6 +775,10 @@ CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
+
+#
+# end of Serial drivers
+#
 CONFIG_IPMI_DMI_DECODE=y
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
@@ -755,6 +789,10 @@ CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 CONFIG_HANGCHECK_TIMER=m
 # CONFIG_TELCLOCK is not set
+
+#
+# end of Character devices
+#
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -774,6 +812,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
 CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_CHT_WC=m
 CONFIG_I2C_NFORCE2_S4985=m
@@ -801,6 +840,10 @@ CONFIG_I2C_MLXCPLD=m
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_KVM=m
+
+#
+# end of PTP clock support
+#
 # CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_MCP23S08=m
@@ -856,7 +899,7 @@ CONFIG_GPIO_TC3589X=y
 CONFIG_GPIO_SODAVILLE=y
 
 #
-# USB GPIO expanders
+# end of USB GPIO expanders
 #
 CONFIG_MAX8925_POWER=m
 CONFIG_WM831X_BACKUP=m
@@ -908,6 +951,10 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 CONFIG_INT3406_THERMAL=m
+
+#
+# end of ACPI INT340X thermal drivers
+#
 CONFIG_INTEL_BXT_PMIC_THERMAL=m
 CONFIG_INTEL_PCH_THERMAL=m
 
@@ -973,10 +1020,14 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 # CONFIG_ABX500_CORE is not set
 
 #
-# STMicroelectronics STMPE Interface Drivers
+# end of STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_MFD_TPS68470=y
 CONFIG_MFD_VX855=m
+
+#
+# end of Multifunction device drivers
+#
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
@@ -1156,11 +1207,11 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 #
 CONFIG_DRM_AMD_DC_DCN1_0=y
 CONFIG_DRM_AMD_DC_DCN1_01=y
-CONFIG_HSA_AMD=y
 
 #
-# AMD Library routines
+# end of Display Engine Configuration
 #
+CONFIG_HSA_AMD=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_ALPHA_SUPPORT=y
 CONFIG_DRM_I915_CAPTURE_ERROR=y
@@ -1180,13 +1231,20 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+
+#
+# end of drm/i915 Debugging
+#
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_FBCON is not set
 # CONFIG_DRM_GMA500 is not set
 
 #
-# Display Interface Bridges
+# end of Display Interface Bridges
 #
+CONFIG_DRM_VBOXVIDEO=m
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_SIS is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -1207,6 +1265,10 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_HYPERV is not set
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
@@ -1218,6 +1280,10 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
+
+#
+# end of Graphics support
+#
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_PCSP=m
 CONFIG_SND_SB_COMMON=m
@@ -1240,7 +1306,7 @@ CONFIG_SND_SONICVIBES=m
 CONFIG_SND_TRIDENT=m
 
 #
-# HD-Audio
+# end of HD-Audio
 #
 CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_I915=y
@@ -1272,7 +1338,7 @@ CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_DWC3_PCI=m
 
 #
-# USB Type-C Alternate Mode drivers
+# end of USB Type-C Alternate Mode drivers
 #
 CONFIG_USB_ROLES_INTEL_XHCI=m
 
@@ -1341,7 +1407,7 @@ CONFIG_DW_DMAC_PCI=y
 CONFIG_HSU_DMA=m
 
 #
-# DMABUF options
+# end of DMABUF options
 #
 CONFIG_DCA=m
 # CONFIG_UIO_HV_GENERIC is not set
@@ -1369,6 +1435,10 @@ CONFIG_XEN_EFI=y
 CONFIG_XEN_ACPI=y
 # CONFIG_XEN_SYMS is not set
 CONFIG_XEN_HAVE_VPMU=y
+
+#
+# end of Xen driver support
+#
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 # CONFIG_ACER_WIRELESS is not set
@@ -1425,7 +1495,6 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_VBTN=m
@@ -1435,7 +1504,6 @@ CONFIG_INTEL_IPS=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
 # CONFIG_APPLE_GMUX is not set
 # CONFIG_INTEL_RST is not set
 CONFIG_INTEL_SMARTCONNECT=m
@@ -1467,10 +1535,14 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+
+#
+# end of Clock Source drivers
+#
 CONFIG_PCC=y
 
 #
-# Generic IOMMU Pagetable Support
+# end of Generic IOMMU Pagetable Support
 #
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_V2=m
@@ -1506,18 +1578,18 @@ CONFIG_EXTCON_INTEL_CHT_WC=m
 # CONFIG_ACPI_ALS is not set
 
 #
-# Temperature sensors
+# end of Temperature sensors
 #
 # CONFIG_PWM is not set
 
 #
-# Performance monitor support
+# end of Performance monitor support
 #
 # CONFIG_RAS_CEC is not set
 CONFIG_THUNDERBOLT=m
 
 #
-# Android
+# end of Android
 #
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
@@ -1540,6 +1612,10 @@ CONFIG_DAX_DRIVER=y
 # CONFIG_MUX_ADG792A is not set
 # CONFIG_MUX_GPIO is not set
 # CONFIG_MUX_MMIO is not set
+
+#
+# end of Multiplexer drivers
+#
 # CONFIG_UNISYS_VISORBUS is not set
 
 #
@@ -1566,6 +1642,14 @@ CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_INTEL_TXT=y
 
 #
+# Memory initialization
+#
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+# CONFIG_STACKLEAK_RUNTIME_DISABLE is not set
+
+#
 # Crypto core or helper
 #
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
@@ -1657,17 +1741,18 @@ CONFIG_UCS2_STRING=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
+CONFIG_ARCH_STACKWALK=y
 
 #
 # Compile-time checks and compiler options
 #
+CONFIG_OPTIMIZE_INLINING=y
 CONFIG_STACK_VALIDATION=y
 
 #
 # Memory Debugging
 #
 CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_KASAN is not set
 
 #
@@ -1687,6 +1772,10 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # RCU Debugging
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
+
+#
+# end of RCU Debugging
+#
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
@@ -1717,7 +1806,6 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 # CONFIG_X86_DEBUG_FPU is not set
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 4227cf7..80a013e 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 5.1
+version    = 5.2
 release    = 1
 thisapp    = linux-%{version}
 
