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

diff --cc Makefile
Simple merge

diff --cc drivers/clk/clk.c
Simple merge

diff --cc drivers/gpu/drm/ast/ast_mode.c
Simple merge

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