linux-next: manual merge of the l2-mtd tree with theslave-dma tree

[Stephen Rothwell]

Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mmc/host/mxs-mmc.c between commit 16052827d98f
("dmaengine/dma_slave: introduce inline wrappers") from the slave-dma
tree and commit c790d78c631f ("mxs-dma : rewrite the last parameter of
mxs_dma_prep_slave_sg()") from the l2-mtd tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mmc/host/mxs-mmc.c
index 65f36cf,4062812..0000000
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@@ -324,8 -324,8 +324,8 @@@ static struct dma_async_tx_descriptor *
  		sg_len = SSP_PIO_NUM;
  	}
  
 -	desc = host->dmach->device->device_prep_slave_sg(host->dmach,
 +	desc = dmaengine_prep_slave_sg(host->dmach,
- 				sgl, sg_len, host->slave_dirn, append);
+ 				sgl, sg_len, host->slave_dirn, flags);
  	if (desc) {
  		desc->callback = mxs_mmc_dma_irq_callback;
  		desc->callback_param = host;

Attachment: pgp00000.pgp
Description: PGP signature