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