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

diff --cc Makefile
Simple merge

diff --cc arch/arm/boot/dts/bcm2711-rpi-4-b.dts
Simple merge

diff --cc arch/arm/boot/dts/bcm2711.dtsi
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.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 sound/usb/quirks-table.h
Simple merge