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