merge origin/stabilization

1 files changed, 145 insertions, 100 deletions

diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 50d724180..4656caba8 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -156,7 +156,9 @@ CONFIG_AK8975=m
 CONFIG_ALI_FIR=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
+CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
+CONFIG_ALTERA_MSGDMA=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -193,6 +195,7 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM_53573 is not set
 # CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM=y
 # CONFIG_ARCH_BERLIN is not set
@@ -342,7 +345,6 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DMA=y
 CONFIG_AT76C50X_USB=m
 CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
 CONFIG_ATA_BMDMA=y
 CONFIG_ATA_GENERIC=m
 CONFIG_ATAGS_PROC=y
@@ -361,6 +363,7 @@ CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_TRACING is not set
+CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_TRACER is not set
@@ -500,6 +503,7 @@ CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATTERY_AXP20X=m
 # CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_BQ27XXX_HDQ=m
 CONFIG_BATTERY_BQ27XXX_I2C=m
 CONFIG_BATTERY_BQ27XXX=m
 CONFIG_BATTERY_DA9052=m
@@ -511,6 +515,7 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_RX51=m
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_TWL4030_MADC=m
@@ -560,7 +565,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 CONFIG_BLK_DEV_BSGLIB=y
@@ -593,10 +597,9 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SKD=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -621,6 +624,7 @@ CONFIG_BNX2=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
 CONFIG_BNXT_DCB=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT=m
 CONFIG_BNXT_SRIOV=y
 CONFIG_BONDING=m
@@ -631,6 +635,7 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
 # CONFIG_BRCMDBG is not set
@@ -720,7 +725,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -801,11 +805,13 @@ CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 # CONFIG_CC10001_ADC is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CCS811 is not set
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_CC_STACKPROTECTOR_NONE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -851,7 +857,7 @@ CONFIG_CHARGER_MANAGER=y
 # CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_MAX8997=m
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
+CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -888,8 +894,8 @@ CONFIG_CIFS_STATS=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
+# CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
 CONFIG_CLK_SP810=y
 CONFIG_CLKSRC_VERSATILE=y
@@ -1055,7 +1061,9 @@ CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+# CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -1066,10 +1074,10 @@ CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_GHASH_ARM_CE=m
-CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_KEYWRAP=m
@@ -1102,7 +1110,7 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
+CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA2_ARM_CE is not set
@@ -1298,7 +1306,7 @@ CONFIG_DONGLE=y
 CONFIG_DOVE_THERMAL=m
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1321,6 +1329,7 @@ CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_DUMB_VGA_DAC=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_ETNAVIV=m
@@ -1427,6 +1436,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_STI=m
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_SUN4I_BACKEND=m
+# CONFIG_DRM_SUN4I_HDMI_CEC is not set
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN8I_MIXER=m
@@ -1441,6 +1451,7 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
@@ -1472,6 +1483,7 @@ CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_CORE=m
 # CONFIG_DVB_CXD2099 is not set
 CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 CONFIG_DVB_DM1105=m
 CONFIG_DVB_DYNAMIC_MINORS=y
@@ -1607,7 +1619,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1627,6 +1638,7 @@ CONFIG_EXTCON_PALMAS=m
 CONFIG_EXTCON_QCOM_SPMI_MISC=m
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -1849,6 +1861,7 @@ CONFIG_GPIO_74X164=m
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
 CONFIG_GPIO_AXP209=m
+CONFIG_GPIO_BD9571MWV=m
 # CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_DA9055=m
@@ -1890,6 +1903,7 @@ CONFIG_GPIO_TPS65218=m
 CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TPS68470=y
 CONFIG_GPIO_TS4800=m
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
@@ -1935,7 +1949,7 @@ CONFIG_HID_ACRUX=m
 CONFIG_HID_ALPS=m
 CONFIG_HID_APPLEIR=m
 CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
@@ -2101,6 +2115,7 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
@@ -2140,10 +2155,10 @@ CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_CORE=y
 # CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
 # CONFIG_I2C_EG20T is not set
@@ -2173,8 +2188,7 @@ CONFIG_I2C_NFORCE2=m
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_OMAP=y
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PIIX4 is not set
 CONFIG_I2C_PXA=m
@@ -2279,6 +2293,7 @@ CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
+CONFIG_IMX_REMOTEPROC=m
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_THERMAL=m
 CONFIG_IMX_WEIM=y
@@ -2308,6 +2323,7 @@ CONFIG_INET=y
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 # CONFIG_INFINIBAND_CXGB3 is not set
 # CONFIG_INFINIBAND_CXGB4 is not set
+# CONFIG_INFINIBAND_EXP_USER_ACCESS is not set
 # CONFIG_INFINIBAND_I40IW is not set
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
@@ -2334,7 +2350,6 @@ CONFIG_INET=y
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 CONFIG_INPUT_88PM80X_ONKEY=m
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -2392,8 +2407,10 @@ CONFIG_INPUT_PMIC8XXX_PWRKEY=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_VIBRA is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
 CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_TABLET=y
@@ -2416,6 +2433,7 @@ CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
@@ -2579,6 +2597,7 @@ CONFIG_IRDA=m
 CONFIG_IR_ENE=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
 CONFIG_IR_HIX5HD2=m
 CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
@@ -2594,6 +2613,7 @@ CONFIG_IR_MESON=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IRNET=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_PWM_TX=m
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_IRQSOFF_TRACER is not set
@@ -2847,6 +2867,7 @@ CONFIG_LCD_VGG2432A4=m
 # CONFIG_LDM_DEBUG is not set
 CONFIG_LDM_PARTITION=y
 # CONFIG_LEDS_AAT1290 is not set
+CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_BD2802 is not set
@@ -2860,7 +2881,7 @@ CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_REGISTER=y
 # CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
+CONFIG_LEDS_IS31FL32XX=m
 # CONFIG_LEDS_KTD2692 is not set
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
@@ -2950,6 +2971,7 @@ CONFIG_LMP91000=m
 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 is not set
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_STAT is not set
@@ -2974,6 +2996,7 @@ CONFIG_LPFC_NVME_INITIATOR=y
 CONFIG_LPFC_NVME_TARGET=y
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LSM_MMAP_MIN_ADDR=32768
+# CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2497 is not set
 # CONFIG_LTC2632 is not set
@@ -3075,6 +3098,7 @@ CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 CONFIG_MDIO_SUN4I=m
 # CONFIG_MDIO_THUNDER is not set
@@ -3128,6 +3152,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 # CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
@@ -3150,6 +3175,7 @@ CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_AXP20X=y
 # CONFIG_MFD_BCM590XX is not set
+CONFIG_MFD_BD9571MWV=m
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_CPCAP is not set
 CONFIG_MFD_CROS_EC_I2C=m
@@ -3225,6 +3251,7 @@ CONFIG_MFD_TPS65910=y
 CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TPS65912_SPI=y
 CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS68470=y
 CONFIG_MFD_TPS80031=y
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_MFD_VIPERBOARD=m
@@ -3270,8 +3297,10 @@ CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_EN_IPSEC is not set
+CONFIG_MLX5_ESWITCH=y
 # CONFIG_MLX5_FPGA is not set
 # CONFIG_MLX5_INFINIBAND is not set
+CONFIG_MLX5_MPFS=y
 # CONFIG_MLX90614 is not set
 CONFIG_MLX_CPLD_PLATFORM=m
 CONFIG_MLXFW=m
@@ -3294,7 +3323,6 @@ CONFIG_MMA8452=m
 # CONFIG_MMC35240 is not set
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_BCM2835=m
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
@@ -3311,7 +3339,7 @@ CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_MXC=m
 CONFIG_MMC_OMAP_HS=m
 CONFIG_MMC_OMAP=m
-CONFIG_MMC_QCOM_DML=m
+CONFIG_MMC_QCOM_DML=y
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
@@ -3341,7 +3369,7 @@ CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
 # CONFIG_MMC_TMIO is not set
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
 CONFIG_MMC_USHC=m
 CONFIG_MMC_VIA_SDMMC=m
@@ -3723,6 +3751,7 @@ CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
+CONFIG_NET_NSH=m
 CONFIG_NET_NS=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_PKTGEN=m
@@ -3794,6 +3823,7 @@ CONFIG_NET_VENDOR_FREESCALE=y
 # CONFIG_NET_VENDOR_FUJITSU is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
 # CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
@@ -3816,6 +3846,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_NET_VENDOR_SNI is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3954,6 +3985,7 @@ CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4166,67 +4198,58 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARIDE is not set
 CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
 # CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
 CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-# CONFIG_PATA_FTIDE010 is not set
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3 is not set
 CONFIG_PATA_IMX=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OF_PLATFORM=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
 CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_PLATFORM is not set
 # CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
 # CONFIG_PC104 is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=y
@@ -4245,6 +4268,7 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
+# CONFIG_PCIE_DW_HOST_ECAM is not set
 CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_DW=y
@@ -4310,10 +4334,12 @@ CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MIPHY28LP=m
 # CONFIG_PHY_MIPHY365X is not set
+# CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4339,6 +4365,7 @@ CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_TEGRA_XUSB=m
 # CONFIG_PHY_TUSB1210 is not set
+# CONFIG_PI433 is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
@@ -4349,13 +4376,11 @@ CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_AS3722=y
 # CONFIG_PINCTRL_BAYTRAIL is not set
-# CONFIG_PINCTRL_BCM281XX is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-# CONFIG_PINCTRL_IMX35 is not set
 CONFIG_PINCTRL_IMX6SL=y
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
@@ -4372,8 +4397,11 @@ CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
+CONFIG_PINCTRL_RK805=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SPRD is not set
+# CONFIG_PINCTRL_SPRD_SC9860 is not set
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
@@ -4450,9 +4478,7 @@ CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPS_CLIENT_GPIO=m
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
 CONFIG_PPS=m
 CONFIG_PPTP=m
 # CONFIG_PREEMPT is not set
@@ -4519,6 +4545,7 @@ CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
 # CONFIG_QCOM_EBI2 is not set
 # CONFIG_QCOM_EMAC is not set
+# CONFIG_QCOM_GLINK_SSR is not set
 CONFIG_QCOM_GSBI=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
@@ -4568,6 +4595,7 @@ CONFIG_R8169=m
 CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
@@ -4589,7 +4617,6 @@ CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
 CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -4648,6 +4675,7 @@ CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD9571MWV=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
 CONFIG_REGULATOR_DA9210=m
@@ -4720,8 +4748,10 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
+CONFIG_RESET_ATTACK_MITIGATION=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
+# CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_TI_SCI is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD_FTL is not set
@@ -4742,6 +4772,7 @@ CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
+# CONFIG_RMNET is not set
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
@@ -4751,6 +4782,7 @@ CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_MBOX=y
+CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_ROCKCHIP_THERMAL=m
@@ -4762,6 +4794,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
+# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
@@ -4945,20 +4978,20 @@ CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_AHCI=y
 # CONFIG_SATA_DWC is not set
 CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_INIC162X=m
+# CONFIG_SATA_INIC162X is not set
 CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
 CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
 # CONFIG_SATA_ZPODD is not set
 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
@@ -5152,13 +5185,13 @@ CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HDAPS=m
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843 is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
 # CONFIG_SENSORS_I5K_AMB is not set
 CONFIG_SENSORS_IBMAEM=m
+# CONFIG_SENSORS_IBM_CFFPS is not set
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_SENSORS_INA209=m
@@ -5250,6 +5283,7 @@ CONFIG_SENSORS_TMP108=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_TSL2550=m
 # CONFIG_SENSORS_TSL2563 is not set
 CONFIG_SENSORS_TWL4030_MADC=m
@@ -5353,6 +5387,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_NVEC_PS2=y
@@ -5367,6 +5402,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
@@ -5385,6 +5421,7 @@ CONFIG_SKGE_GENESIS=y
 CONFIG_SKGE=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_SKY2=m
+CONFIG_SLAB_FREELIST_HARDENED=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLICOSS is not set
@@ -5503,7 +5540,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INPUT_BEEP=y
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_RECONFIG=y
@@ -5616,6 +5653,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DIO2125=m
@@ -5731,6 +5769,7 @@ CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
+CONFIG_SND_SOC_WM8524=m
 # CONFIG_SND_SOC_WM8580 is not set
 # CONFIG_SND_SOC_WM8711 is not set
 # CONFIG_SND_SOC_WM8728 is not set
@@ -5890,6 +5929,7 @@ CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SRAM=y
 # CONFIG_SRF04 is not set
 # CONFIG_SRF08 is not set
@@ -5931,20 +5971,23 @@ CONFIG_ST_REMOTEPROC=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
+# CONFIG_STRING_SELFTEST is not set
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_STRIP is not set
 CONFIG_ST_THERMAL=m
 CONFIG_ST_THERMAL_MEMMAP=m
 # CONFIG_ST_THERMAL_SYSCFG is not set
+CONFIG_SUN4I_A10_CCU=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN4I_GPADC=m
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
 CONFIG_SUN8I_A33_CCU=y
-# CONFIG_SUN8I_A83T_CCU is not set
-# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
 CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_R40_CCU=y
 CONFIG_SUN8I_R_CCU=y
 CONFIG_SUN8I_V3S_CCU=y
 CONFIG_SUN9I_A80_CCU=y
@@ -5960,8 +6003,7 @@ CONFIG_SUNXI_CCU=y
 CONFIG_SUNXI_RSB=m
 CONFIG_SUNXI_SRAM=y
 CONFIG_SUNXI_WATCHDOG=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
 CONFIG_SWIOTLB=y
@@ -6132,6 +6174,8 @@ CONFIG_TIGON3=m
 # CONFIG_TIMER_STATS is not set
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
+# CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_ST7586 is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
@@ -6139,8 +6183,7 @@ CONFIG_TI_PIPE3=m
 # CONFIG_TI_SCI_CLK is not set
 CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_ST=m
-CONFIG_TI_SYSCON_RESET=m
+# CONFIG_TI_ST is not set
 CONFIG_TI_THERMAL=y
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set
@@ -6486,7 +6529,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
@@ -6609,7 +6651,6 @@ CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 # CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7840=m
 # CONFIG_USB_SERIAL_MXUPORT is not set
@@ -6801,6 +6842,7 @@ CONFIG_VIDEO_IMX_VDOA=m
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
@@ -6814,8 +6856,8 @@ CONFIG_VIDEO_OMAP3=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
-# CONFIG_VIDEO_RENESAS_VSP1 is not set
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_SAA6588=m
@@ -6929,6 +6971,7 @@ CONFIG_W1_SLAVE_DS2438=m
 CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS2805=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_THERM=m
@@ -6948,6 +6991,7 @@ CONFIG_WATCHDOG=y
 CONFIG_WCN36XX=m
 CONFIG_WDAT_WDT=m
 CONFIG_WDTPCI=m
+CONFIG_WIL6210_DEBUGFS=y
 CONFIG_WIL6210_ISR_COR=y
 CONFIG_WIL6210=m
 # CONFIG_WIL6210_TRACING is not set
@@ -7046,6 +7090,7 @@ CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 # CONFIG_ZPA2326 is not set
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y