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