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