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/usb/host/xhci-ring.c
Simple merge

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

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