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