Merge remote-tracking branch 'spi/fix/setup' into spi-linus