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