Merge remote-tracking branch 'spi/for-5.12' into spi-next