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-i686-debug-fedora.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kernel-i686-debug-fedora.config') diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index ef007e929..a2b662b90 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -926,7 +926,6 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_FIXED_MMIO is not set # CONFIG_COMMON_CLK_FSL_FLEXSPI is not set # CONFIG_COMMON_CLK_FSL_SAI is not set -CONFIG_COMMON_CLK_HI3559A=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_MMP2_AUDIO is not set # CONFIG_COMMON_CLK_PWM is not set @@ -1418,7 +1417,7 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_GUD=m # CONFIG_DRM_HISI_HIBMC is not set -# CONFIG_DRM_HYPERV is not set +CONFIG_DRM_HYPERV=m # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m @@ -2322,7 +2321,7 @@ CONFIG_HYPERV_KEYBOARD=m CONFIG_HYPERV=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_STORAGE=m -# CONFIG_HYPERV_TESTING is not set +CONFIG_HYPERV_TESTING=y CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_VSOCKETS=m CONFIG_HYSDN_CAPI=y @@ -2569,7 +2568,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m -CONFIG_INFINIBAND_VMWARE_PVRDMA=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -3903,6 +3902,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 is not set # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set CONFIG_NE2K_PCI=m -- cgit