Merge branch 'spi-5.3' into spi-linus

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

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