Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/net/phy/broadcom.c
index 3130377,dbed15d..8b0ac38
--- 1/drivers/net/phy/broadcom.c
--- 2/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@@ -292,19 -339,21 +348,24 @@@ static int bcm54xx_config_init(struct p
  
        bcm54xx_adjust_rxrefclk(phydev);
  
-       if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
+       switch (BRCM_PHY_MODEL(phydev)) {
+       case PHY_ID_BCM50610:
+       case PHY_ID_BCM50610M:
+               err = bcm54xx_config_clock_delay(phydev);
+               break;
+       case PHY_ID_BCM54210E:
                err = bcm54210e_config_init(phydev);
-               if (err)
-                       return err;
-       } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54213PE) {
-               err = bcm54213pe_config_init(phydev);
-               if (err)
-                       return err;
-       } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54612E) {
+               break;
+       case PHY_ID_BCM54612E:
                err = bcm54612e_config_init(phydev);
-               if (err)
-                       return err;
-       } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
+               break;
++      case PHY_ID_BCM54213PE:
++              err = bcm54213pe_config_init(phydev);
++              break;
+       case PHY_ID_BCM54616S:
+               err = bcm54616s_config_init(phydev);
+               break;
+       case PHY_ID_BCM54810:
                /* For BCM54810, we need to disable BroadR-Reach function */
                val = bcm_phy_read_exp(phydev,
                                       BCM54810_EXP_BROADREACH_LRE_MISC_CTL);

diff --cc include/linux/brcmphy.h
Simple merge

diff --cc mm/page_alloc.c
Simple merge