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