Merge remote-tracking branches 'spi/fix/idr' and 'spi/fix/sh-msiof' into spi-linus