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>

28 files changed, 80 insertions, 155 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7633b2faa..e055331e5 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 18
+RHEL_RELEASE = 23
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index e354012ff..80afa5742 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/807dd7c3997fc8ed8936a3d1b2da1d158cd9500b
+ 807dd7c3997fc8ed8936a3d1b2da1d158cd9500b Revert "scsi: smartpqi: add inspur advantech ids"
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/c86a777b719e3777a9663a13a739840fb48a20ef
  c86a777b719e3777a9663a13a739840fb48a20ef Revert "kdump: add support for crashkernel=auto"
 
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
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index ec5f2477e..04f244ae0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -845,7 +845,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # 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_HI3559A is not set
 CONFIG_COMMON_CLK_HI3660=y
 # CONFIG_COMMON_CLK_HI3670 is not set
 CONFIG_COMMON_CLK_HI3798CV200=y
@@ -1331,7 +1331,6 @@ CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_HISI_KIRIN is not set
-# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -2104,7 +2103,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HWSPINLOCK_QCOM is not set
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
-CONFIG_HYPERV_IOMMU=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2332,7 +2330,6 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -3207,7 +3204,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -6606,7 +6602,6 @@ CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index d40b65732..4b744d34f 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1713,7 +1713,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
@@ -3936,7 +3935,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
@@ -4281,6 +4279,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
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index cf34d517b..c5ceb5369 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -845,7 +845,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # 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_HI3559A is not set
 CONFIG_COMMON_CLK_HI3660=y
 # CONFIG_COMMON_CLK_HI3670 is not set
 CONFIG_COMMON_CLK_HI3798CV200=y
@@ -1323,7 +1323,6 @@ CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_HISI_KIRIN is not set
-# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -2088,7 +2087,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HWSPINLOCK_QCOM is not set
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
-CONFIG_HYPERV_IOMMU=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2316,7 +2314,6 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -3187,7 +3184,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -6583,7 +6579,6 @@ CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 089540146..91e00acf9 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1150,7 +1150,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_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_MESON8B=y
@@ -1738,7 +1737,6 @@ CONFIG_DRM_GUD=m
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -4023,7 +4021,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
@@ -4382,6 +4379,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
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 85bd7922f..1eff149bc 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1150,7 +1150,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_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_MESON8B=y
@@ -1731,7 +1730,6 @@ CONFIG_DRM_GUD=m
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -4001,7 +3999,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
@@ -4360,6 +4357,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
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 34fa84009..59b6deba4 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1123,7 +1123,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_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_MESON8B=y
@@ -1706,7 +1705,6 @@ CONFIG_DRM_GUD=m
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -3937,7 +3935,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
@@ -4279,6 +4276,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
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 1b7342930..aa29aa5f4 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1123,7 +1123,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_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_MESON8B=y
@@ -1699,7 +1698,6 @@ CONFIG_DRM_GUD=m
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -3915,7 +3913,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
@@ -4257,6 +4254,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
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
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index abe3a87d4..f5c509fc2 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -925,7 +925,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
@@ -1409,7 +1408,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
@@ -2552,7 +2551,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
@@ -3881,6 +3880,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
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index f85ee98a4..364790b7a 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -877,7 +877,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
@@ -1342,7 +1341,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GUD=m
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -3349,7 +3347,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
@@ -3633,6 +3630,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
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 9f4f6bf45..ab00a0807 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -209,7 +209,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
@@ -719,7 +718,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
@@ -1184,7 +1182,6 @@ 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_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -1937,7 +1934,6 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
-CONFIG_HYPERV_IOMMU=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2158,7 +2154,6 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -3036,7 +3031,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -6371,7 +6365,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index f7ca2d0cd..eae87d454 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -876,7 +876,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
@@ -1333,7 +1332,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GUD=m
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -3326,7 +3324,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
@@ -3610,6 +3607,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
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 9ca73eebb..fe6dc8cb7 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -209,7 +209,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
@@ -719,7 +718,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
@@ -1176,7 +1174,6 @@ 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_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -1921,7 +1918,6 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
-CONFIG_HYPERV_IOMMU=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2142,7 +2138,6 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -3019,7 +3014,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -6352,7 +6346,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index e711ac274..2b413d33e 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -884,7 +884,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
@@ -1350,7 +1349,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GUD=m
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 # CONFIG_DRM_I2C_CH7006 is not set
@@ -3337,7 +3335,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
@@ -3618,6 +3615,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
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 44ab99ddf..3b71e2835 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -209,7 +209,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
@@ -722,7 +721,6 @@ CONFIG_CMM=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
@@ -1189,7 +1187,6 @@ 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_I2C_ADV7511 is not set
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -1926,7 +1923,6 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
-CONFIG_HYPERV_IOMMU=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2142,7 +2138,6 @@ CONFIG_INFINIBAND_RDMAVT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 # CONFIG_INFINIBAND_USER_MAD is not set
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -3020,7 +3015,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MINIX_FS is not set
@@ -6332,7 +6326,6 @@ CONFIG_VMCP_CMA_SIZE=4
 CONFIG_VMCP=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMLOGRDR=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 2d008e360..b6cab9761 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -883,7 +883,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
@@ -1341,7 +1340,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GUD=m
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 # CONFIG_DRM_I2C_CH7006 is not set
@@ -3314,7 +3312,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
@@ -3595,6 +3592,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
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index bff27df20..b4b612196 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -209,7 +209,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
@@ -722,7 +721,6 @@ CONFIG_CMM=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
@@ -1181,7 +1179,6 @@ 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_I2C_ADV7511 is not set
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -1910,7 +1907,6 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
-CONFIG_HYPERV_IOMMU=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2126,7 +2122,6 @@ CONFIG_INFINIBAND_RDMAVT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 # CONFIG_INFINIBAND_USER_MAD is not set
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -3003,7 +2998,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MINIX_FS is not set
@@ -6313,7 +6307,6 @@ CONFIG_VMCP_CMA_SIZE=4
 CONFIG_VMCP=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMLOGRDR=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index b104afb7b..b383c0e15 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -209,7 +209,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
@@ -727,7 +726,6 @@ CONFIG_CMM_IUCV=y
 # 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
@@ -1190,7 +1188,6 @@ 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_I2C_ADV7511 is not set
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
@@ -1924,7 +1921,6 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
-CONFIG_HYPERV_IOMMU=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -2140,7 +2136,6 @@ CONFIG_INFINIBAND_RDMAVT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 # CONFIG_INFINIBAND_USER_MAD is not set
 CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
@@ -3022,7 +3017,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCODE_OLD_INTERFACE is not set
 CONFIG_MICROSEMI_PHY=m
-CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MINIX_FS is not set
@@ -6348,7 +6342,6 @@ CONFIG_VMCP_CMA_SIZE=4
 # CONFIG_VME_BUS is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VMLOGRDR=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index aa6595f0a..5159eee2e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -940,7 +940,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
@@ -1460,7 +1459,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
@@ -2616,7 +2615,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
@@ -3944,6 +3943,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
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
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index d5e0b86fa..42bc69c25 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -939,7 +939,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
@@ -1451,7 +1450,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
@@ -2599,7 +2598,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
@@ -3922,6 +3921,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
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 543fafa30..76dcd3aa6 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-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
@@ -1260,7 +1258,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
@@ -1457,6 +1455,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
@@ -1604,7 +1603,7 @@ CONFIG_FAT_FS=m
 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
@@ -3725,7 +3724,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
@@ -4128,7 +4127,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
@@ -4159,6 +4158,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
@@ -4517,7 +4517,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
@@ -5148,6 +5148,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
@@ -5707,6 +5708,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
diff --git a/kernel.spec b/kernel.spec
index 5adcdf4d2..4dfdebac0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
-%global distro_build 0.rc1.20210714git40226a3d96ef.18
+%global distro_build 0.rc2.23
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -117,13 +117,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 0.rc1.20210714git40226a3d96ef.18
+%define pkgrelease 0.rc2.23
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20210714git40226a3d96ef.18%{?buildid}%{?dist}
+%define specrelease 0.rc2.23%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -655,7 +655,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc1-16-g40226a3d96ef.tar.xz
+Source0: linux-5.14-rc2.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1340,8 +1340,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14-rc1-16-g40226a3d96ef -c
-mv linux-5.14-rc1-16-g40226a3d96ef linux-%{KVERREL}
+%setup -q -n kernel-5.14-rc2 -c
+mv linux-5.14-rc2 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2922,6 +2922,16 @@ fi
 #
 #
 %changelog
+* 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)
+
+* Thu Jul 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210715git40226a3d96ef.19]
+- all: hyperv: use the DRM driver rather than FB (Peter Robinson)
+- all: hyperv: unify the Microsoft HyperV configs (Peter Robinson)
+- all: VMWare: clean up VMWare configs (Peter Robinson)
+- Update CONFIG_ARM_FFA_TRANSPORT (Patrick Talbert)
+
 * Wed Jul 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210714git40226a3d96ef.18]
 - CI: Handle all mirrors (Veronika Kabatova)
 - Turn on CONFIG_STACKTRACE for s390x zfpcdump kernels (Justin M. Forbes)
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch
index 46df63e31..5d1862926 100644
--- a/patch-5.14.0-redhat.patch
+++ b/patch-5.14.0-redhat.patch
@@ -42,7 +42,6 @@
  drivers/scsi/mpt3sas/mpt3sas_scsih.c               |   4 +
  drivers/scsi/qla2xxx/qla_os.c                      |   6 +
  drivers/scsi/qla4xxx/ql4_os.c                      |   2 +
- drivers/scsi/smartpqi/smartpqi_init.c              |  16 +
  drivers/usb/core/hub.c                             |   7 +
  include/linux/efi.h                                |  22 +-
  include/linux/kernel.h                             |  15 +
@@ -82,7 +81,7 @@
  tools/testing/selftests/bpf/progs/linked_maps2.c   |  76 ---
  tools/testing/selftests/bpf/progs/linked_vars1.c   |  54 --
  tools/testing/selftests/bpf/progs/linked_vars2.c   |  55 ---
- 84 files changed, 1178 insertions(+), 1492 deletions(-)
+ 83 files changed, 1162 insertions(+), 1492 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 index bdb22006f713..61a3a4a4730b 100644
@@ -138,7 +137,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index c3f9bd191b89..e3c43232203c 100644
+index e4f5895badb5..90e631652aaf 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -160,7 +159,7 @@ index c3f9bd191b89..e3c43232203c 100644
  		   -Werror=return-type -Wno-format-security \
  		   -std=gnu89
  KBUILD_CPPFLAGS := -D__KERNEL__
-@@ -1256,7 +1261,13 @@ define filechk_version.h
+@@ -1257,7 +1262,13 @@ define filechk_version.h
  	((c) > 255 ? 255 : (c)))';                                       \
  	echo \#define LINUX_VERSION_MAJOR $(VERSION);                    \
  	echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL);            \
@@ -176,7 +175,7 @@ index c3f9bd191b89..e3c43232203c 100644
 
  $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 3ea1c417339f..a52069686c33 100644
+index 82f908fa5676..6ffefb694a23 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -1480,9 +1480,9 @@ config HIGHMEM
@@ -192,7 +191,7 @@ index 3ea1c417339f..a52069686c33 100644
  	  The VM uses one page of physical memory for each page table.
  	  For systems with a lot of processes, this can use a lot of
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index e07e7de9ac49..65aa88fad60d 100644
+index b5b13a932561..37af638217aa 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -914,7 +914,7 @@ endchoice
@@ -1764,40 +1763,6 @@ index 6ee7ea4c27e0..31814931620a 100644
  	{0, 0},
  };
  MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
-diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
-index dcc0b9618a64..6d1c08b435dc 100644
---- a/drivers/scsi/smartpqi/smartpqi_init.c
-+++ b/drivers/scsi/smartpqi/smartpqi_init.c
-@@ -8807,6 +8807,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
- 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- 			       0x19e5, 0xd22c)
- 	},
-+	{
-+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
-+			       0x1bd4, 0x004a)
-+	},
-+	{
-+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
-+			       0x1bd4, 0x004b)
-+	},
-+	{
-+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
-+			       0x1bd4, 0x004c)
-+	},
- 	{
- 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- 			       PCI_VENDOR_ID_ADAPTEC2, 0x0110)
-@@ -9063,6 +9075,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
- 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- 			       PCI_VENDOR_ID_ADVANTECH, 0x8312)
- 	},
-+	{
-+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
-+			       PCI_VENDOR_ID_ADVANTECH, 0x8312)
-+	},
- 	{
- 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- 			       PCI_VENDOR_ID_DELL, 0x1fe0)
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
 index d1efc7141333..2e2877e0cea4 100644
 --- a/drivers/usb/core/hub.c
@@ -2334,7 +2299,7 @@ index 24eda04221e9..128837ea1fb2 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index bb0d6e6262b1..90ec1ffc75b1 100644
+index 55f9f7738ebb..564553afb251 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
 @@ -1625,7 +1625,7 @@ config AIO
diff --git a/sources b/sources
index 7d11eabbc..d6a11fa56 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8
-SHA512 (linux-5.14-rc1-16-g40226a3d96ef.tar.xz) = f84ed5fb4ce484b6c727e06198c4bbe8f2f9b3da4b7c0960d6e4c4ffe04d8f438ca2c76746a517a50f562bc53503d8d421460b8e91ead81861259a2c1e1423a6
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc1.20210714git40226a3d96ef.18.tar.bz2) = faf471b1dfd684fff920a9239e618374a2778db69dd4e52b158940d69e8caf875a9f794ba33c006aa0f91e12f8fd72111cebc0dc80e2b19e68d177fe98b5ac6d
-SHA512 (kernel-kabi-dw-5.14.0-0.rc1.20210714git40226a3d96ef.18.tar.bz2) = 014793b0c249517786de428aaf357633d383e0f9aa078bb876c63563ee46c255240852bb6e35dbfef42e1d95991f829d28087729ef07db44f70187504b6f97e5
+SHA512 (linux-5.14-rc2.tar.xz) = eedea34a3b41454d9585779928f4a77850739cfa6d38eaa2004fb3cdb5e81d5ed483e8b71ffe469425a468477201700d1584251a0fc250099dd75da18c721fc5
+SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.23.tar.bz2) = 506fe31ba1e1b44850848d88e144860337d20baac0e04856362320ec0d5dd40c5a7543c5fbb101e8d1d258cd654d4fb13af77b9da70223e3cfd7645e05cdc8ab
+SHA512 (kernel-kabi-dw-5.14.0-0.rc2.23.tar.bz2) = bc9b0cb52145999b407e18a457dfe7c91fe9305b12e03472ab9a4d2bf1b6fe9f1f9c93328a4b052c9744ca3652b97298975d854c23f59e0f98bbb1d35db73dfa