Merge branch 'spi-5.1' into spi-5.2

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

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

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

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

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