Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus