Merge remote-tracking branch 'spi/topic/pdata' into spi-next