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

diff --cc Makefile
Simple merge

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

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

diff --cc drivers/usb/gadget/function/f_hid.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge