merge originkernel-5.13.0-0.rc0.20210504git5e321ded302d.7.vanilla.1.fc34

1 files changed, 31 insertions, 6 deletions

diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index f1dfbabae..a108e62f6 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -618,6 +618,7 @@ CONFIG_BATTERY_MAX17040=m
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_SBS=m
+CONFIG_BATTERY_SURFACE=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
@@ -1011,6 +1012,7 @@ CONFIG_CHARGER_MAX8997=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_SURFACE=m
 CONFIG_CHARGER_TPS65090=m
 CONFIG_CHARGER_UCS1002=m
 CONFIG_CHARLCD_BL_FLASH=y
@@ -1151,6 +1153,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CORESIGHT is not set
+# CONFIG_CORESIGHT_TRBE is not set
 CONFIG_CORTINA_PHY=m
 # CONFIG_COUNTER is not set
 # CONFIG_CPU5_WDT is not set
@@ -1245,7 +1248,7 @@ CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
@@ -2375,7 +2378,7 @@ CONFIG_GPIO_TPS68470=y
 CONFIG_GPIO_VIPERBOARD=m
 CONFIG_GPIO_WATCHDOG=m
 # CONFIG_GPIO_WINBOND is not set
-CONFIG_GPIO_WM8994=m
+# CONFIG_GPIO_WM8994 is not set
 # CONFIG_GPIO_WS16C48 is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_XRA1403 is not set
@@ -2442,6 +2445,7 @@ CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_EZKEY=m
+# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GENERIC=y
 CONFIG_HID_GFRM=m
@@ -2621,6 +2625,7 @@ CONFIG_I2C_CADENCE=m
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_COMPAT=y
+# CONFIG_I2C_CP2615 is not set
 CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_DAVINCI is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -2643,6 +2648,7 @@ CONFIG_I2C_HID_ACPI=m
 CONFIG_I2C_HID=m
 CONFIG_I2C_HID_OF_GOODIX=m
 CONFIG_I2C_HID_OF=m
+# CONFIG_I2C_HISI is not set
 # CONFIG_I2C_I801 is not set
 CONFIG_I2C_IMX_LPI2C=m
 CONFIG_I2C_IMX=m
@@ -3439,6 +3445,7 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_IS31FL319X is not set
 CONFIG_LEDS_IS31FL32XX=m
 # CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LGM is not set
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM355x is not set
@@ -3468,6 +3475,7 @@ CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
+# CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 CONFIG_LEDS_SGM3140=m
 # CONFIG_LEDS_SPI_BYTE is not set
@@ -4123,7 +4131,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y
 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_MTDRAM=m
 # CONFIG_MTD_NAND_ARASAN is not set
 # CONFIG_MTD_NAND_BRCMNAND is not set
 CONFIG_MTD_NAND_CADENCE=m
@@ -4169,7 +4177,9 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PMC551 is not set
 CONFIG_MTD_PSTORE=m
 # CONFIG_MTD_QCOMSMEM_PARTS is not set
+CONFIG_MTDRAM_ERASE_SIZE=128
 # CONFIG_MTD_RAM is not set
+CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
@@ -5150,6 +5160,7 @@ CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_PALMAS=y
 # CONFIG_PINCTRL_QCS404 is not set
 CONFIG_PINCTRL_RK805=m
+CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SAMSUNG=y
 # CONFIG_PINCTRL_SC7180 is not set
 # CONFIG_PINCTRL_SC7280 is not set
@@ -5187,6 +5198,7 @@ CONFIG_PINCTRL_SUN9I_A80_R=y
 CONFIG_PINCTRL_SUN9I_A80=y
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ZYNQMP=y
 # CONFIG_PING is not set
 CONFIG_PINMUX=y
 CONFIG_PJ4B_ERRATA_4742=y
@@ -5328,6 +5340,7 @@ CONFIG_PTDUMP_DEBUGFS=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
+CONFIG_PTP_1588_CLOCK_KVM=y
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 # CONFIG_PTP_1588_CLOCK_VMW is not set
@@ -5590,7 +5603,7 @@ CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 # CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
-CONFIG_REGULATOR_WM8994=m
+# CONFIG_REGULATOR_WM8994 is not set
 CONFIG_REGULATOR=y
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
@@ -6031,6 +6044,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_INFINIBAND is not set
+# CONFIG_SECURITY_LANDLOCK is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
 CONFIG_SECURITY_LOCKDOWN_LSM=y
@@ -6641,6 +6655,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
+# CONFIG_SND_SOC_FSL_RPMSG is not set
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@@ -6657,6 +6672,7 @@ CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 CONFIG_SND_SOC_IMX_HDMI=m
+# CONFIG_SND_SOC_IMX_RPMSG is not set
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -6730,13 +6746,16 @@ CONFIG_SND_SOC_ROCKCHIP_PDM=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_RT1308_SDW=m
+CONFIG_SND_SOC_RT1316_SDW=m
 # CONFIG_SND_SOC_RT5616 is not set
 CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5659=m
 CONFIG_SND_SOC_RT5660=m
 CONFIG_SND_SOC_RT5682_SDW=m
 CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 CONFIG_SND_SOC_SAMSUNG=m
@@ -6827,7 +6846,9 @@ CONFIG_SND_SOC_TLV320AIC23_SPI=m
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
 CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
 CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6891,6 +6912,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VIA82XX is not set
 # CONFIG_SND_VIA82XX_MODEM is not set
 CONFIG_SND_VIRMIDI=m
+# CONFIG_SND_VIRTIO is not set
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 # CONFIG_SND_XEN_FRONTEND is not set
@@ -7127,10 +7149,13 @@ CONFIG_SURFACE_AGGREGATOR_BUS=y
 CONFIG_SURFACE_AGGREGATOR_CDEV=m
 # CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
 CONFIG_SURFACE_AGGREGATOR=m
-# CONFIG_SURFACE_AGGREGATOR_REGISTRY is not set
-# CONFIG_SURFACE_DTX is not set
+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+CONFIG_SURFACE_DTX=m
 CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_HID=m
 CONFIG_SURFACE_HOTPLUG=m
+CONFIG_SURFACE_KBD=m
+CONFIG_SURFACE_PLATFORM_PROFILE=m
 CONFIG_SURFACE_PLATFORMS=y
 CONFIG_SURFACE_PRO3_BUTTON=m
 CONFIG_SUSPEND=y