Merge branch 'spi-4.17' into spi-4.18 for the merge window

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

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

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