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

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/gpu/drm/qxl/qxl_display.c
Simple merge

diff --cc drivers/mmc/host/sdhci-iproc.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/usb/host/xhci-pci.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/host/xhci.h
index 6bad152,d01241f..2cc777f
--- 1/drivers/usb/host/xhci.h
--- 2/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1879,8 -1879,7 +1879,9 @@@ struct xhci_hcd 
  #define XHCI_SKIP_PHY_INIT    BIT_ULL(37)
  #define XHCI_DISABLE_SPARSE   BIT_ULL(38)
  #define XHCI_SG_TRB_CACHE_SIZE_QUIRK  BIT_ULL(39)
- #define XHCI_EP_CTX_BROKEN_DCS        BIT_ULL(40)
- #define XHCI_AVOID_DQ_ON_LINK BIT_ULL(41)
+ #define XHCI_NO_SOFT_RETRY    BIT_ULL(40)
++#define XHCI_EP_CTX_BROKEN_DCS        BIT_ULL(41)
++#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(42)
  
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;

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

diff --cc mm/page_alloc.c
Simple merge