merge origin, 5.2.0

1 files changed, 155 insertions, 35 deletions

diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index ef134d413..25d715f9a 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -60,6 +60,7 @@ CONFIG_ACPI_EC_DEBUGFS=m
 # CONFIG_ACPI_EXTLOG is not set
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_HED=y
+CONFIG_ACPI_HMAT=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_ACPI_IPMI=m
 # CONFIG_ACPI_NFIT is not set
@@ -226,6 +227,7 @@ CONFIG_APM=y
 CONFIG_APPLE_GMUX=m
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_APPLICOM is not set
+CONFIG_AQTION=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
 # CONFIG_ARCH_DAVINCI is not set
@@ -344,6 +346,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BUSES_BCMA_AND_SSB=y
@@ -379,7 +382,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
@@ -398,6 +400,7 @@ CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV=m
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_BATMAN_ADV_TRACING=y
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_DS2760 is not set
@@ -604,6 +607,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_MTKSDIO=m
 # CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
@@ -730,17 +734,17 @@ CONFIG_CHARGER_CROS_USBPD=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_MANAGER is not set
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_CHARLCD_BL_FLASH=y
 # CONFIG_CHARLCD_BL_OFF is not set
 # CONFIG_CHARLCD_BL_ON is not set
-# CONFIG_CHASH_SELFTEST is not set
-# CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
@@ -777,6 +781,12 @@ CONFIG_CIFS_XATTR=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
+# CONFIG_CLK_SIFIVE is not set
+# CONFIG_CLK_SUNXI_CLOCKS is not set
+# CONFIG_CLK_SUNXI is not set
+# CONFIG_CLK_SUNXI_PRCM_SUN6I is not set
+# CONFIG_CLK_SUNXI_PRCM_SUN8I is not set
+# CONFIG_CLK_SUNXI_PRCM_SUN9I is not set
 # CONFIG_CLOCK_THERMAL is not set
 CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
@@ -810,7 +820,7 @@ CONFIG_COMPAL_LAPTOP=m
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_COMPILE_TEST is not set
 CONFIG_CONFIGFS_FS=y
-# CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=3
@@ -818,6 +828,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_CORTINA_PHY=m
+# CONFIG_COUNTER is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_CPU5_WDT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
@@ -867,9 +878,11 @@ CONFIG_CROS_EC_DEBUGFS=m
 CONFIG_CROS_EC_I2C=m
 # CONFIG_CROS_EC_LIGHTBAR is not set
 CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_AEGIS128L=m
@@ -933,6 +946,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1030,6 +1044,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -1048,6 +1063,7 @@ CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_DEBUG_NOTIFIERS=y
@@ -1063,8 +1079,8 @@ CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
-CONFIG_DEBUG_PI_LIST=y
 # CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DEBUG_PLIST is not set
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -1143,6 +1159,7 @@ CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
@@ -1163,7 +1180,7 @@ CONFIG_DM_UEVENT=y
 CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
-# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ZERO=y
 CONFIG_DM_ZONED=m
 CONFIG_DNET=m
@@ -1225,12 +1242,14 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
+# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 CONFIG_DRM_PANEL_BRIDGE=y
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -1243,6 +1262,8 @@ CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
@@ -1259,13 +1280,16 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
+# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
+# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
@@ -1275,6 +1299,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VIA is not set
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -1573,6 +1598,7 @@ CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
+# CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_NET=m
@@ -1661,6 +1687,7 @@ CONFIG_FUTEX=y
 CONFIG_FW_CFG_SYSFS=m
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
+CONFIG_FXAS21002C=m
 CONFIG_GACT_PROB=y
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
@@ -1670,7 +1697,11 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
@@ -1727,6 +1758,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_MAX77650=m
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
@@ -1826,6 +1858,7 @@ CONFIG_HID_LENOVO=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_LOGITECH_HIDPP=m
 CONFIG_HID_LOGITECH=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MALTRON=m
 CONFIG_HID_MAYFLASH=m
@@ -1875,6 +1908,7 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_HID_TIVO=m
 CONFIG_HID_TOPSEED=m
 CONFIG_HID_TWINHAN=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_UDRAW_PS3=m
 CONFIG_HID_VIEWSONIC=m
@@ -2009,6 +2043,7 @@ CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 # CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
@@ -2146,6 +2181,7 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_TRIGGER=y
 # CONFIG_IKCONFIG is not set
+CONFIG_IKHEADERS=m
 # CONFIG_IMA_APPRAISE is not set
 # CONFIG_IMA_ARCH_POLICY is not set
 CONFIG_IMA_DEFAULT_HASH_SHA1=y
@@ -2165,10 +2201,6 @@ CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INET_DIAG=m
@@ -2178,14 +2210,12 @@ CONFIG_INET_IPCOMP=m
 CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
 # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_INFINIBAND_IPOIB_CM=y
@@ -2212,6 +2242,7 @@ CONFIG_INFINIBAND_USNIC=m
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INIT_STACK_NONE=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -2234,6 +2265,7 @@ CONFIG_INPUT_FF_MEMLESS=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 # CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_JOYDEV=m
@@ -2244,6 +2276,7 @@ CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
@@ -2294,6 +2327,7 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SVM=y
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IPS=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
 CONFIG_INTEL_MEI_HDCP=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
@@ -2572,6 +2606,8 @@ CONFIG_IXGBE=m
 CONFIG_IXGBEVF_IPSEC=y
 CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
+# CONFIG_IXP4XX_NPE is not set
+# CONFIG_IXP4XX_QMGR is not set
 CONFIG_JBD2_DEBUG=y
 CONFIG_JBD2=y
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
@@ -2667,6 +2703,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
 CONFIG_KEYBOARD_PMIC8XXX=m
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
@@ -2685,6 +2722,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
 # CONFIG_KMX61 is not set
+# CONFIG_KPC2000 is not set
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_KPROBE_EVENTS=y
 # CONFIG_KPROBES_SANITY_TEST is not set
@@ -2714,7 +2752,6 @@ CONFIG_L2TP_V3=y
 # CONFIG_LAPB is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_LATTICE_ECP3_CONFIG is not set
-CONFIG_LBDAF=y
 # CONFIG_LCD_AMS369FG06 is not set
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_HX8357 is not set
@@ -2751,6 +2788,7 @@ CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_IS31FL32XX=m
 # CONFIG_LEDS_KTD2692 is not set
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM355x is not set
 CONFIG_LEDS_LM3601X=m
 # CONFIG_LEDS_LM3642 is not set
@@ -2763,6 +2801,7 @@ CONFIG_LEDS_LP3952=m
 # CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_LP8860 is not set
 CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_MAX77650=m
 CONFIG_LEDS_MLXCPLD=m
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_NIC78BX=m
@@ -2831,6 +2870,7 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
 CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
 CONFIG_LOCK_STAT=y
 CONFIG_LOCK_TORTURE_TEST=m
 CONFIG_LOCKUP_DETECTOR=y
@@ -2915,6 +2955,7 @@ CONFIG_MARVELL_PHY=m
 CONFIG_MAX1363=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
+CONFIG_MAX31856=m
 # CONFIG_MAX44000 is not set
 CONFIG_MAX44009=m
 # CONFIG_MAX517 is not set
@@ -2926,6 +2967,7 @@ CONFIG_MAX44009=m
 CONFIG_MAXIM_THERMOCOUPLE=m
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_MAXSMP=y
+CONFIG_MB1232=m
 # CONFIG_MC3230 is not set
 # CONFIG_MCB is not set
 # CONFIG_MCORE2 is not set
@@ -2969,7 +3011,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_DVB=y
 CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
@@ -3045,6 +3087,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 # CONFIG_MFD_MADERA is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
@@ -3071,6 +3114,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -3109,6 +3153,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_INTEL=y
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROSEMI_PHY=m
 CONFIG_MIGRATION=y
@@ -3267,11 +3312,10 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3298,14 +3342,25 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MCHP23K256 is not set
 # CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_NAND_BRCMNAND is not set
 CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_CS553X is not set
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_DENALI_PCI is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_FSL_IFC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MESON is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_QCOM is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_SUNXI is not set
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_ONENAND is not set
 # CONFIG_MTD_OOPS is not set
@@ -3314,6 +3369,7 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
+CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SHARPSL_PARTS is not set
@@ -3329,7 +3385,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MTK_MMC is not set
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_MTRR_SANITIZER=y
@@ -3409,19 +3464,25 @@ CONFIG_NET_DEVLINK=y
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 # CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MT7530=m
+# CONFIG_NET_DSA_MV88E6060 is not set
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
+# CONFIG_NET_DSA_SJA1105 is not set
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
 CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 # CONFIG_NET_DSA_VITESSE_VSC73XX is not set
 CONFIG_NET_EMATCH_CANID=m
 CONFIG_NET_EMATCH_CMP=m
@@ -3645,6 +3706,7 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_NET_VENDOR_XILINX=y
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_NET_VRF=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -3761,8 +3823,6 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_COMPAT=m
 # CONFIG_NFT_CONNLIMIT is not set
 CONFIG_NFT_COUNTER=m
@@ -3865,6 +3925,7 @@ CONFIG_NORTEL_HERMES=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOUVEAU_DEBUG_MMU=y
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
@@ -3873,8 +3934,10 @@ CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
+CONFIG_NULL_TTY=m
 # CONFIG_NUMA is not set
 CONFIG_NVME_FC=m
+CONFIG_NVMEM_SYSFS=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVME_RDMA=m
@@ -3910,7 +3973,7 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_VXLAN=m
 # CONFIG_OPROFILE is not set
 CONFIG_OPT3001=m
-CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ORINOCO_USB=m
@@ -3928,6 +3991,7 @@ CONFIG_P54_USB=m
 CONFIG_PA12203001=m
 CONFIG_PACKET_DIAG=m
 CONFIG_PACKET=y
+CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
@@ -4121,6 +4185,26 @@ CONFIG_PINCTRL_LEWISBURG=m
 CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_SDM660 is not set
 # CONFIG_PINCTRL_SINGLE is not set
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
+# CONFIG_PINCTRL_SUN50I_H6 is not set
+# CONFIG_PINCTRL_SUN50I_H6_R is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
@@ -4256,6 +4340,7 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+# CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
 CONFIG_QEDI=m
@@ -4282,7 +4367,6 @@ CONFIG_R6040=m
 CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
-CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_SAA7706H=m
@@ -4329,7 +4413,7 @@ CONFIG_RCU_NOCB_CPU=y
 # CONFIG_RCU_PERF_TEST is not set
 CONFIG_RCU_TORTURE_TEST=m
 # CONFIG_RCU_TRACE is not set
-# CONFIG_RC_XBOX_DVD is not set
+CONFIG_RC_XBOX_DVD=m
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
@@ -4366,6 +4450,7 @@ CONFIG_REGULATOR_BD9571MWV=m
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX77650=m
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
@@ -4579,6 +4664,11 @@ CONFIG_RTLLIB=m
 # CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUGFS is not set
+# CONFIG_RTW88_DEBUG is not set
+CONFIG_RTW88=m
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_RXKAD=y
 CONFIG_S2IO=m
@@ -4816,8 +4906,10 @@ CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
 # CONFIG_SENSORS_ISL29018 is not set
 # CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_K10TEMP=m
@@ -4880,6 +4972,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -4972,6 +5065,7 @@ CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_ST_ASC is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
@@ -4997,6 +5091,7 @@ CONFIG_SFI=y
 CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
 # CONFIG_SI1145 is not set
 # CONFIG_SI7005 is not set
@@ -5225,6 +5320,7 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_FSL_MICFIL is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
@@ -5236,6 +5332,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5266,6 +5363,7 @@ CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
@@ -5306,6 +5404,24 @@ CONFIG_SND_SOC_RT5660=m
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+# CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+CONFIG_SND_SOC_SOF_PCI=m
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
@@ -5554,7 +5670,7 @@ CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
 CONFIG_TCG_TPM=y
-# CONFIG_TCG_VTPM_PROXY is not set
+CONFIG_TCG_VTPM_PROXY=m
 # CONFIG_TCG_XEN is not set
 CONFIG_TCM_FC=m
 CONFIG_TCM_FILEIO=m
@@ -5610,6 +5726,7 @@ CONFIG_TEST_LIST_SORT=y
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_USER_COPY is not set
@@ -5628,6 +5745,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
@@ -5651,9 +5769,9 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS124S08 is not set
 # CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS8344=m
 # CONFIG_TI_ADS8688 is not set
 CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
@@ -5717,6 +5835,7 @@ CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 CONFIG_TOUCHSCREEN_MCS5000=m
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -5766,7 +5885,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y
 # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
 # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_TRUSTED_KEYS=m
@@ -5798,6 +5916,7 @@ CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
 # CONFIG_TYPEC_RT1711H is not set
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_TCPM=m
@@ -5836,6 +5955,8 @@ CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULI526X=m
 # CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
@@ -5961,7 +6082,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6153,9 +6274,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
@@ -6290,7 +6410,6 @@ CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
@@ -6537,6 +6656,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set