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

From: Stephen Rothwell
Date: Sun Jul 22 2012 - 01:36:05 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/dma/dmaengine.c between commit 634332502366 ("dmaengine: Cleanup
logging messages") from the slave-dma tree and commit
"drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma
channel message" from the akpm tree.

Just context changes. I fixed it up (see below) and can carry the fix as
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/dma/dmaengine.c
index 3491654,6c87d67..0000000
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@@ -582,8 -578,8 +582,8 @@@ void dmaengine_get(void
} else if (err)
- pr_err("%s: failed to get %s: (%d)\n",
+ pr_debug("%s: failed to get %s: (%d)\n",
- __func__, dma_chan_name(chan), err);
+ __func__, dma_chan_name(chan), err);

Attachment: pgp00000.pgp
Description: PGP signature