spi changes queued up for v3.3 merge window