linux-next: manual merge of the spi tree with the origin tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1491 bytes --]

Hi all,

Today's linux-next merge of the spi tree got a conflict in:

  drivers/spi/spi-imx.c

between commit:

  59eb22641f0c5 ("spi: imx: fix slab corruption from undersized DMA bounce buffers")

from the origin tree and commit:

  853de617c4a62 ("spi: use dmaengine_get_dma_device() instead of chan->device->dev")

from the spi tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/spi/spi-imx.c
index 3851c50dbe314,868f963e61371..0000000000000
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@ -1921,9 -1919,8 +1921,9 @@@ static int spi_imx_dma_package_transfer
  		return ret;
  
  	/* Trim the DMA RX buffer and copy the actual data to rx_buf */
- 	dma_sync_single_for_cpu(controller->dma_rx->device->dev, dma_data->dma_rx_addr,
+ 	dma_sync_single_for_cpu(dmaengine_get_dma_device(controller->dma_rx), dma_data->dma_rx_addr,
 -				dma_data->dma_len, DMA_FROM_DEVICE);
 +				DMA_CACHE_ALIGNED_LEN(dma_data->dma_len),
 +				DMA_FROM_DEVICE);
  	spi_imx_dma_rx_data_handle(spi_imx, dma_data, transfer->rx_buf + spi_imx->rx_offset,
  				   word_delay);
  	spi_imx->rx_offset += dma_data->data_len;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]