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