Merge remote-tracking branch 'spi/fix/img-spfi' into spi-linus