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

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-quirks.c
Simple merge

diff --cc drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
Simple merge

diff --cc drivers/mmc/core/block.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge

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

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

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

diff --cc drivers/usb/host/xhci.h
index 209c828f4e4652b072915b3c819a37dd6811bb4f,d3c0766c1984b021d22f70ce4d06eb69b924a154..cb3c4fdf892a08cc2e8f10005afa30a7686160e3
--- 1/drivers/usb/host/xhci.h
--- 2/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1905,9 -1904,7 +1905,10 @@@ struct xhci_hcd 
  #define XHCI_BROKEN_D3COLD    BIT_ULL(41)
  #define XHCI_EP_CTX_BROKEN_DCS        BIT_ULL(42)
  #define XHCI_SUSPEND_RESUME_CLKS      BIT_ULL(43)
- #define XHCI_AVOID_DQ_ON_LINK BIT_ULL(44)
- #define XHCI_VLI_TRB_CACHE_BUG        BIT_ULL(45)
- #define XHCI_VLI_SS_BULK_OUT_BUG      BIT_ULL(46)
+ #define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
++#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(45)
++#define XHCI_VLI_TRB_CACHE_BUG        BIT_ULL(46)
++#define XHCI_VLI_SS_BULK_OUT_BUG      BIT_ULL(47)
  
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;

diff --cc include/uapi/linux/videodev2.h
Simple merge