merge origin

1 files changed, 99 insertions, 40 deletions

diff --git a/kernel-i686.config b/kernel-i686.config
index 18990b101..8f60aa6d5 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -104,7 +104,6 @@ CONFIG_AD5272=m
 # CONFIG_AD5933 is not set
 CONFIG_AD7124=m
 # CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
@@ -112,9 +111,12 @@ CONFIG_AD7124=m
 # CONFIG_AD7298 is not set
 # CONFIG_AD7303 is not set
 # CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
 # CONFIG_AD7606 is not set
 # CONFIG_AD7746 is not set
 CONFIG_AD7766=m
+# CONFIG_AD7768_1 is not set
 # CONFIG_AD7780 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
@@ -195,6 +197,7 @@ CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 # CONFIG_ALIX is not set
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
+# CONFIG_ALTERA_FREEZE_BRIDGE is not set
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
 CONFIG_ALTERA_PR_IP_CORE=m
@@ -732,6 +735,9 @@ CONFIG_CHARGER_CROS_USBPD=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=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
@@ -788,6 +794,7 @@ CONFIG_CODA_FS=m
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -796,13 +803,13 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 CONFIG_COMPAL_LAPTOP=m
 # CONFIG_COMPAT_BRK is not set
 # 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_CONNECTOR=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=3
@@ -830,6 +837,7 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
+# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_ISOLATION is not set
 CONFIG_CPUMASK_OFFSTACK=y
@@ -854,7 +862,9 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
+# CONFIG_CROS_EC_DEBUGFS is not set
 CONFIG_CROS_EC_I2C=m
+# CONFIG_CROS_EC_LIGHTBAR is not set
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
@@ -936,6 +946,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1087,6 +1098,8 @@ CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI=m
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+# CONFIG_DEV_DAX_KMEM is not set
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -1124,6 +1137,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INIT=y
 CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
@@ -1175,6 +1189,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
@@ -1194,6 +1209,7 @@ CONFIG_DRM_I915_GVT_KVMGT=m
 CONFIG_DRM_I915_GVT=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
+# CONFIG_DRM_KOMEDA is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_LVDS_ENCODER is not set
@@ -1203,12 +1219,14 @@ CONFIG_DRM_MGAG200=m
 # 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_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_LVDS is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -1225,7 +1243,9 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
@@ -1350,7 +1370,6 @@ CONFIG_E1000E=m
 CONFIG_E1000=m
 CONFIG_E100=m
 CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
 CONFIG_EARLY_PRINTK_USB_XDBC=y
 # CONFIG_EBC_C384_WDT is not set
 CONFIG_ECHO=m
@@ -1424,7 +1443,6 @@ CONFIG_ETHERNET=y
 CONFIG_ETHOC=m
 # CONFIG_EUROTECH_WDT is not set
 # CONFIG_EVM is not set
-# CONFIG_EXOFS_FS is not set
 # CONFIG_EXPERT is not set
 # CONFIG_EXPOLINE_AUTO is not set
 CONFIG_EXPOLINE_FULL=y
@@ -1433,7 +1451,6 @@ CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_EXT4_ENCRYPTION=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
@@ -1442,6 +1459,7 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_GPIO is not set
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
@@ -1451,7 +1469,6 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_F2FS_FS_ENCRYPTION is not set
 CONFIG_F2FS_FS=m
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
@@ -1494,7 +1511,6 @@ CONFIG_FB_I810=m
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
-# CONFIG_FB_LOGO_CENTER is not set
 # CONFIG_FB_MATROX_G is not set
 # CONFIG_FB_MATROX_I2C is not set
 # CONFIG_FB_MATROX is not set
@@ -1534,7 +1550,6 @@ CONFIG_FB_VGA16=m
 CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
-# CONFIG_FB_XGI is not set
 CONFIG_FB=y
 CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
@@ -1597,7 +1612,11 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
 # CONFIG_FTL is not set
@@ -1633,7 +1652,7 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
-CONFIG_GCC_PLUGIN_STACKLEAK=y
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
@@ -1668,6 +1687,7 @@ CONFIG_GPD_POCKET_FAN=m
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMD8111 is not set
+CONFIG_GPIO_AMD_FCH=m
 CONFIG_GPIO_AMDPT=m
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
@@ -1679,6 +1699,7 @@ CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_GW_PLD is not set
 # CONFIG_GPIO_HLWD is not set
 CONFIG_GPIO_ICH=m
 CONFIG_GPIO_IT87=m
@@ -1722,6 +1743,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
 # CONFIG_GUP_BENCHMARK is not set
+# CONFIG_HABANA_AI is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1788,6 +1810,7 @@ CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_LOGITECH_HIDPP=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_MAGICMOUSE=y
+CONFIG_HID_MALTRON=m
 CONFIG_HID_MAYFLASH=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
@@ -1837,6 +1860,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_VIEWSONIC=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_WIIMOTE=m
@@ -1942,6 +1966,7 @@ CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYPERV_BALLOON=m
+CONFIG_HYPERV_IOMMU=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV=m
@@ -2209,6 +2234,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
+# CONFIG_INPUT_MSM_VIBRATOR is not set
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_PM8XXX_VIBRATOR=m
@@ -2251,6 +2277,7 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SVM=y
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IPS=m
+CONFIG_INTEL_MEI_HDCP=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_INTEL_MEI_TXE=m
@@ -2277,6 +2304,7 @@ CONFIG_INTEL_TELEMETRY=m
 CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
+# CONFIG_INTERCONNECT is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
@@ -2288,7 +2316,7 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IOSF_MBI=y
 CONFIG_IO_STRICT_DEVMEM=y
@@ -2334,8 +2362,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2349,7 +2377,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -2454,6 +2482,7 @@ CONFIG_IR_PWM_TX=m
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_SERIAL=m
@@ -2596,7 +2625,8 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KEXEC_FILE is not set
 # CONFIG_KEXEC_JUMP is not set
-CONFIG_KEXEC_VERIFY_SIG=y
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_SIG=y
 CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
@@ -2606,7 +2636,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_CAP11XX is not set
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
 CONFIG_KEYBOARD_GPIO=m
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
+CONFIG_KEYBOARD_GPIO_POLLED=m
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8333 is not set
@@ -2679,6 +2709,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LDISC_AUTOLOAD=y
 # CONFIG_LDM_DEBUG is not set
 CONFIG_LDM_PARTITION=y
 # CONFIG_LEDS_AAT1290 is not set
@@ -2778,8 +2809,8 @@ CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
+# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
 CONFIG_LOCK_DOWN_KERNEL=y
-# CONFIG_LOCK_DOWN_MANDATORY is not set
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
@@ -2800,6 +2831,7 @@ CONFIG_LP_CONSOLE=y
 CONFIG_LPC_SCH=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 CONFIG_LTC1660=m
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
@@ -2865,6 +2897,7 @@ CONFIG_MAX1363=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
 # CONFIG_MAX44000 is not set
+CONFIG_MAX44009=m
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5481 is not set
 # CONFIG_MAX5487 is not set
@@ -2896,6 +2929,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -2950,9 +2984,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -2989,6 +3020,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_MADERA is not set
@@ -3021,6 +3053,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
@@ -3040,6 +3073,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TPS65912_SPI is not set
 CONFIG_MFD_TPS68470=y
 # CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_TQMX86 is not set
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_VX855=m
 CONFIG_MFD_WL1273_CORE=m
@@ -3112,6 +3146,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y
 CONFIG_MLXSW_SPECTRUM=m
 CONFIG_MLXSW_SWITCHIB=m
 CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLX_WDT=m
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
 CONFIG_MMA7660=m
@@ -3205,7 +3240,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
@@ -3217,6 +3252,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3249,6 +3285,7 @@ CONFIG_MTD_NAND_CAFE=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_OMAP2 is not set
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_ONENAND is not set
@@ -3348,7 +3385,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -3670,6 +3707,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
@@ -3704,8 +3742,6 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_COMPAT=m
@@ -3725,8 +3761,6 @@ CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
 # CONFIG_NFTL is not set
 CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_NUMGEN=m
@@ -3736,8 +3770,6 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_REJECT=m
@@ -3882,6 +3914,7 @@ CONFIG_PACKET=y
 # CONFIG_PAGE_POISONING is not set
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PANASONIC_LAPTOP=m
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
 # CONFIG_PANEL is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_TIMEOUT=0
@@ -3895,6 +3928,7 @@ CONFIG_PARMAN=m
 CONFIG_PARPORT_1284=y
 # CONFIG_PARPORT_AX88796 is not set
 CONFIG_PARPORT=m
+# CONFIG_PARPORT_PANEL is not set
 # CONFIG_PARPORT_PC_FIFO is not set
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_PC_PCMCIA=m
@@ -3951,6 +3985,7 @@ CONFIG_PATA_WINBOND=m
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=y
+CONFIG_PCENGINES_APU2=m
 CONFIG_PCH_CAN=m
 CONFIG_PCH_DMA=m
 CONFIG_PCH_GBE=m
@@ -3960,12 +3995,14 @@ CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEAER=y
+# CONFIG_PCIE_ALTERA is not set
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 CONFIG_PCIEASPM=y
+# CONFIG_PCIE_BW is not set
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_DPC=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
@@ -4029,6 +4066,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONET is not set
+# CONFIG_PHY_CADENCE_DPHY is not set
 CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_SIERRA=m
 # CONFIG_PHY_CPCAP_USB is not set
@@ -4036,7 +4074,6 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4085,6 +4122,7 @@ CONFIG_PM_DEVFREQ=y
 # CONFIG_PMIC_DA903X is not set
 CONFIG_PMIC_OPREGION=y
 CONFIG_PM_OPP=y
+# CONFIG_PMS7003 is not set
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_TRACE_RTC=y
@@ -4139,6 +4177,7 @@ CONFIG_PPTP=m
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTER=m
+# CONFIG_PRINTK_CALLER is not set
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -4338,8 +4377,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
-CONFIG_RESCTRL=y
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 CONFIG_RETPOLINE=y
@@ -4407,9 +4445,11 @@ CONFIG_RT73USB=m
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
+CONFIG_RTC_DRV_ABEOZ9=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
+# CONFIG_RTC_DRV_CADENCE is not set
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1286=m
 # CONFIG_RTC_DRV_DS1302 is not set
@@ -4468,6 +4508,7 @@ CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_RS5C348=m
 CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_RV3028=m
 CONFIG_RTC_DRV_RV3029C2=m
 CONFIG_RTC_DRV_RV3029_HWMON=y
 # CONFIG_RTC_DRV_RV8803 is not set
@@ -4478,6 +4519,7 @@ CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SA1100 is not set
+CONFIG_RTC_DRV_SD3078=m
 # CONFIG_RTC_DRV_SNVS is not set
 CONFIG_RTC_DRV_STK17TA8=m
 # CONFIG_RTC_DRV_TEST is not set
@@ -4622,10 +4664,6 @@ CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_MYRB=m
 CONFIG_SCSI_MYRS=m
 # CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
 CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_PMCRAID=m
 # CONFIG_SCSI_PPA is not set
@@ -4680,8 +4718,8 @@ CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SAFESETID is not set
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_DEVELOP=y
@@ -4691,6 +4729,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ACPI_POWER=m
@@ -4995,7 +5034,6 @@ CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
@@ -5116,7 +5154,6 @@ CONFIG_SND_SEQUENCER_OSS=m
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
@@ -5143,6 +5180,7 @@ CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5154,6 +5192,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 CONFIG_SND_SOC_CS43130=m
+# CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DMIC=m
@@ -5166,6 +5205,7 @@ 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_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_SSI is not set
@@ -5219,6 +5259,8 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
@@ -5235,6 +5277,7 @@ CONFIG_SND_SOC_PCM3060_SPI=m
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_RK3328 is not set
 CONFIG_SND_SOC_RL6231=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
@@ -5285,12 +5328,15 @@ CONFIG_SND_SOC_WM8524=m
 # CONFIG_SND_SOC_WM8804 is not set
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8904 is not set
 # CONFIG_SND_SOC_WM8960 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 CONFIG_SND_SONICVIBES=m
@@ -5356,13 +5402,16 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
 # CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_SLAVE is not set
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
@@ -5370,6 +5419,7 @@ CONFIG_SPI_PXA2XX=m
 CONFIG_SPI=y
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPMI is not set
+# CONFIG_SPS30 is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
@@ -5536,12 +5586,14 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SORT is not set
+# CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_UUID is not set
+# CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_XARRAY is not set
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
@@ -5576,13 +5628,16 @@ CONFIG_THUNDERBOLT_NET=m
 CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS124S08 is not set
 # CONFIG_TI_ADS7950 is not set
 # 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
 CONFIG_TI_DAC7311=m
+# CONFIG_TI_DAC7612 is not set
 CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
@@ -5732,7 +5787,6 @@ CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_AUTHENTICATION=y
-CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_UBIFS_FS_XATTR=y
@@ -5780,6 +5834,7 @@ CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_ATM=m
 # CONFIG_USB_AUDIO is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_BELKIN=y
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_CATC=m
@@ -5801,6 +5856,7 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DWC3_OF_SIMPLE is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EHCI_FSL is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -6102,6 +6158,7 @@ CONFIG_UWB_WHCI=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
+CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_VBOXGUEST=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
@@ -6163,6 +6220,7 @@ CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_VIDEO_EM28XX_V4L2=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
 CONFIG_VIDEO_FB_IVTV=m
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_GO7007_LOADER=m
@@ -6248,6 +6306,7 @@ CONFIG_VMWARE_PVSCSI=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VMXNET3=m
+# CONFIG_VOP_BUS is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS=m
@@ -6399,7 +6458,6 @@ CONFIG_X86_POWERNOW_K8=m
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
@@ -6408,6 +6466,7 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 # CONFIG_X86_SYSFB is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_BACKEND=y