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/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
Simple merge

diff --cc drivers/gpu/drm/rcar-du/rcar_du_crtc.c
Simple merge

diff --cc drivers/gpu/drm/tegra/dc.c
Simple merge

diff --cc drivers/gpu/drm/xlnx/zynqmp_disp.c
Simple merge

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

diff --cc drivers/video/fbdev/Kconfig
Simple merge

diff --cc include/uapi/drm/drm_fourcc.h
Simple merge