Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-next