Merge remote-tracking branches 'spi/topic/fsl-espi', 'spi/topic/imx', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge

diff --cc include/linux/spi/spi.h
index 74278c7d0f52940a7e55c4946dec66925be3cc5b,f2d3960cc3c368be93010d19beca4c85ffb00638,072cb2aa24139981b0459eaa8f01d28406b384b4,072cb2aa24139981b0459eaa8f01d28406b384b4,072cb2aa24139981b0459eaa8f01d28406b384b4,072cb2aa24139981b0459eaa8f01d28406b384b4..4b743ac3539623889b6e2d8cc008df062e0f2b34
--- 1/include/linux/spi/spi.h
--- 2/include/linux/spi/spi.h
--- 3/include/linux/spi/spi.h
--- 4/include/linux/spi/spi.h
--- 5/include/linux/spi/spi.h
--- 6/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@@@@@@ -1045,8 -1041,35 -1024,35 -1024,35 -1024,35 -1024,35 +1062,8 @@@@@@@ spi_read(struct spi_device *spi, void *
                        .rx_buf         = buf,
                        .len            = len,
                };
 -----  struct spi_message      m;
  ----
  ----  spi_message_init(&m);
  ----  spi_message_add_tail(&t, &m);
  ----  return spi_sync(spi, &m);
  ----}
      
 -      spi_message_init(&m);
 -      spi_message_add_tail(&t, &m);
 -      return spi_sync(spi, &m);
 -    }
 -    
 -----/**
 ----- * spi_sync_transfer - synchronous SPI data transfer
 ----- * @spi: device with which data will be exchanged
 ----- * @xfers: An array of spi_transfers
 ----- * @num_xfers: Number of items in the xfer array
 ----- * Context: can sleep
 ----- *
 ----- * Does a synchronous SPI data transfer of the given spi_transfer array.
 ----- *
 ----- * For more specific semantics see spi_sync().
 ----- *
 ----- * Return: Return: zero on success, else a negative error code.
 ----- */
 -----static inline int
 -----spi_sync_transfer(struct spi_device *spi, struct spi_transfer *xfers,
 -----  unsigned int num_xfers)
 -----{
 -----  struct spi_message msg;
 -----
 -----  spi_message_init_with_transfers(&msg, xfers, num_xfers);
 -----
 -----  return spi_sync(spi, &msg);
 +++++  return spi_sync_transfer(spi, &t, 1);
      }
      
      /* this copies txbuf and rxbuf data; for small transfers only! */