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