kernel-5.14.0-0.rc1.20210719git1d67c8d993ba.22

* Mon Jul 19 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210719git1d67c8d993ba.22]
- Revert "scsi: smartpqi: add inspur advantech ids" (Herton R. Krzesinski)
- redhat/configs: Enable stmmac NIC for x86_64 (Mark Salter)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

1 files changed, 13 insertions, 8 deletions

diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index cbccc6fd7..5d4580baf 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -233,7 +233,6 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
 # CONFIG_ARM_MHU_V2 is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
@@ -749,7 +748,6 @@ CONFIG_CNIC=m
 # CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
 CONFIG_COMMON_CLK_HI3516CV300=y
 CONFIG_COMMON_CLK_HI3519=y
-CONFIG_COMMON_CLK_HI3559A=y
 CONFIG_COMMON_CLK_HI3660=y
 # CONFIG_COMMON_CLK_HI3670 is not set
 CONFIG_COMMON_CLK_HI3798CV200=y
@@ -1268,7 +1266,7 @@ CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
-# CONFIG_DRM_HYPERV is not set
+CONFIG_DRM_HYPERV=m
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -1465,6 +1463,7 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=y
 # CONFIG_DW_EDMA is not set
 # CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DWMAC_INTEL=m
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_DW_XDATA_PCIE is not set
@@ -1620,7 +1619,7 @@ CONFIG_FAULT_INJECTION=y
 CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_HYPERV=m
+# CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
@@ -2076,7 +2075,7 @@ CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_TESTING=y
+# CONFIG_HYPERV_TESTING is not set
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_VSOCKETS=m
 CONFIG_HYSDN_CAPI=y
@@ -3744,7 +3743,7 @@ CONFIG_NET_VENDOR_ROCKER=y
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
@@ -4147,7 +4146,7 @@ CONFIG_PCI=y
 # CONFIG_PCMCIA is not set
 # CONFIG_PCNET32 is not set
 CONFIG_PCPU_DEV_REFCNT=y
-# CONFIG_PCS_XPCS is not set
+CONFIG_PCS_XPCS=m
 # CONFIG_PDA_POWER is not set
 # CONFIG_PDC_ADMA is not set
 # CONFIG_PEAQ_WMI is not set
@@ -4178,6 +4177,7 @@ CONFIG_PHY_BCM_SR_USB=m
 # CONFIG_PHY_INTEL_EMMC is not set
 # CONFIG_PHY_INTEL_LGM_EMMC is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -4537,7 +4537,7 @@ CONFIG_RELOCATABLE=y
 CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_BRCMSTB_RESCAL is not set
-# CONFIG_RESET_CONTROLLER is not set
+CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
@@ -5168,6 +5168,7 @@ CONFIG_SFC_MTD=y
 CONFIG_SFC_SRIOV=y
 CONFIG_SFI=y
 # CONFIG_SF_PDMA is not set
+# CONFIG_SFP is not set
 CONFIG_SGETMASK_SYSCALL=y
 # CONFIG_SGI_GRU_DEBUG is not set
 CONFIG_SGI_GRU=m
@@ -5729,6 +5730,10 @@ CONFIG_STE10XP=m
 # CONFIG_STK8BA50 is not set
 CONFIG_STM_DUMMY=m
 CONFIG_STM=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PCI is not set
+# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STM_PROTO_BASIC=m
 CONFIG_STM_PROTO_SYS_T=m
 CONFIG_STM_SOURCE_CONSOLE=m