linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

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

  drivers/dma/iop-adma.c

between commit:

  00c9755524fb ("dmaengine: iop-adma: use correct printk format strings")

from the arm-soc tree and commit:

  d17d9ea95727 ("dmaengine: iop-adma.c: fix printk format warning")

from the slave-dma 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/dma/iop-adma.c
index 03f4a588cf7f,003b753e4604..000000000000
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@@ -116,9 -116,9 +116,9 @@@ static void __iop_adma_slot_cleanup(str
  	list_for_each_entry_safe(iter, _iter, &iop_chan->chain,
  					chain_node) {
  		pr_debug("\tcookie: %d slot: %d busy: %d "
- 			"this_desc: %#x next_desc: %#llx ack: %d\n",
 -			"this_desc: %pad next_desc: %#x ack: %d\n",
++			"this_desc: %pad next_desc: %#llx ack: %d\n",
  			iter->async_tx.cookie, iter->idx, busy,
- 			iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
 -			&iter->async_tx.phys, iop_desc_get_next_desc(iter),
++			&iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
  			async_tx_test_ack(&iter->async_tx));
  		prefetch(_iter);
  		prefetch(&_iter->async_tx);

Attachment: pgpLPaRtBrwz_.pgp
Description: OpenPGP digital signature