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