Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

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

diff --cc include/linux/spi/spi.h
Simple merge