Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next