Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc3.20210728git7d549995d4e0.31.vanilla.1.fc35

1 files changed, 7 insertions, 26 deletions

diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index eb5384ee6..b18fc6566 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1326,7 +1326,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 # CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_CROS_EC_ANX7688 is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1457,7 +1456,8 @@ CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VIA is not set
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_VKMS=m
-# CONFIG_DRM_VMWGFX is not set
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_XEN_FRONTEND is not set
 # CONFIG_DRM_XEN is not set
 # CONFIG_DS1682 is not set
@@ -1555,7 +1555,6 @@ CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
-CONFIG_DWMAC_IMX8=m
 CONFIG_DWMAC_INTEL_PLAT=m
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
@@ -1725,7 +1724,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
-CONFIG_FB_VIRTUAL=m
+# CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
 CONFIG_FC_APPID=y
@@ -1781,13 +1780,7 @@ CONFIG_FSCACHE_STATS=y
 CONFIG_FS_DAX=y
 CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
 CONFIG_FS_ENCRYPTION=y
-CONFIG_FSI=m
-# CONFIG_FSI_MASTER_ASPEED is not set
-CONFIG_FSI_MASTER_GPIO=m
-CONFIG_FSI_MASTER_HUB=m
-# CONFIG_FSI_NEW_DEV_NODE is not set
-# CONFIG_FSI_SBEFIFO is not set
-CONFIG_FSI_SCOM=m
+# CONFIG_FSI is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@@ -1923,7 +1916,6 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_TPIC2810 is not set
-CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_WATCHDOG is not set
@@ -2127,7 +2119,6 @@ CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM_XIPHERA=m
 CONFIG_HW_RANDOM=y
-# CONFIG_HWSPINLOCK_SUN6I is not set
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 # CONFIG_HYPERV_TESTING is not set
@@ -2228,7 +2219,6 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_ICST is not set
-# CONFIG_IDE is not set
 # CONFIG_IDLE_INJECT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_IEEE802154_6LOWPAN=m
@@ -2454,7 +2444,6 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_PMT_TELEMETRY is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-# CONFIG_INTEL_SKL_INT3472 is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
@@ -3286,7 +3275,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912 is not set
 # CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS68470 is not set
 # CONFIG_MFD_TPS80031 is not set
 # CONFIG_MFD_TQMX86 is not set
 # CONFIG_MFD_VIPERBOARD is not set
@@ -4357,7 +4345,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
 # CONFIG_PHY_QCOM_USB_SS is not set
-# CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set
 # CONFIG_PHY_TUSB1210 is not set
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
@@ -4603,7 +4590,6 @@ CONFIG_QUOTACTL=y
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
-# CONFIG_R3964 is not set
 CONFIG_R6040=m
 CONFIG_R8169=m
 # CONFIG_R8188EU is not set
@@ -4640,7 +4626,6 @@ CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 # CONFIG_RAVE_SP_CORE is not set
-CONFIG_RAW_DRIVER=y
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_RC_CORE=y
@@ -4793,10 +4778,10 @@ CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
+# CONFIG_RPMSG is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
-CONFIG_RPMSG_VIRTIO=m
-# CONFIG_RPMSG_WWAN_CTRL is not set
+# CONFIG_RPMSG_VIRTIO is not set
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_COEX=y
@@ -5693,7 +5678,6 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
-# CONFIG_SND_SOC_IMX_CARD is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5704,7 +5688,6 @@ CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 # CONFIG_SND_SOC_LPASS_RX_MACRO is not set
 # CONFIG_SND_SOC_LPASS_TX_MACRO is not set
@@ -5746,7 +5729,6 @@ CONFIG_SND_SOC_PCM3060_SPI=m
 # 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_RK817 is not set
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
@@ -5793,7 +5775,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
-CONFIG_SND_SOC_SSM2518=m
+# CONFIG_SND_SOC_SSM2518 is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
 # CONFIG_SND_SOC_SSM4567 is not set
@@ -5987,7 +5969,6 @@ CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
 CONFIG_STACK_TRACER=y
 CONFIG_STACK_VALIDATION=y
 # CONFIG_STAGING_BOARD is not set
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
 # CONFIG_STAGING is not set
 CONFIG_STAGING_MEDIA=y
 CONFIG_STANDALONE=y