Merge branch 'spi-fix' into spi-next