* linux-next: manual merge of the akpm tree with the slave-dma tree
@ 2012-07-22 5:35 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-07-22 5:35 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Joe Perches, Vinod Koul, Fabio Estevam
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
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
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
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
list_del_rcu(&device->global_node);
break;
} 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 #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-07-22 5:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-22 5:35 linux-next: manual merge of the akpm tree with the slave-dma tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).