From 5f0e0f3c714a197de8d36ab1c984fc722e87c60d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 19 Jul 2021 08:26:09 -0500 Subject: kernel-5.14.0-0.rc1.20210719git1d67c8d993ba.22 * Mon Jul 19 2021 Fedora Kernel Team [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 --- kernel-aarch64-debug-fedora.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel-aarch64-debug-fedora.config') diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 789e94096..99cae1350 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1721,7 +1721,6 @@ CONFIG_DRM_HDLCD=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set # CONFIG_DRM_HISI_HIBMC is not set CONFIG_DRM_HISI_KIRIN=m -# CONFIG_DRM_HYPERV is not set CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_I2C_ADV7511=m @@ -3959,7 +3958,6 @@ CONFIG_MICROCHIP_PHY=m # CONFIG_MICROCHIP_PIT64B is not set # CONFIG_MICROCHIP_T1_PHY is not set CONFIG_MICROSEMI_PHY=m -CONFIG_MICROSOFT_MANA=m CONFIG_MIGRATION=y CONFIG_MII=m CONFIG_MINIX_FS=m @@ -4304,6 +4302,7 @@ CONFIG_NATSEMI=m # CONFIG_NAU7802 is not set # CONFIG_NBPFAXI_DMA is not set CONFIG_NCSI_OEM_CMD_GET_MAC=y +CONFIG_NCSI_OEM_CMD_KEEP_PHY=y CONFIG_ND_BLK=m CONFIG_ND_BTT=m # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set -- cgit