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

diff --cc Makefile
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

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

diff --cc drivers/staging/fbtft/fbtft-core.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge