Merge branch 'spi-4.20' into spi-linus