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