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

2014-12-09 Thread Stephen Rothwell
Hi Krzysztof, On Tue, 09 Dec 2014 14:38:48 +0100 Krzysztof Kozlowski wrote: > > Looks almost good: > ++ pm_runtime_mark_last_busy(pl330->ddma.dev); > ++ pm_runtime_put_autosuspend(pl330->ddma.dev);1 > ^here Thanks for pointing that o

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

2014-12-09 Thread Krzysztof Kozlowski
On wto, 2014-12-09 at 14:09 +1100, Stephen Rothwell wrote: > Hi Vinod, > > Today's linux-next merge of the slave-dma tree got a conflict in > drivers/dma/pl330.c between commits ae43b3289186 ("ARM: 8202/1: > dmaengine: pl330: Add runtime Power Management support v12") and > b816ccc5c01f ("ARM: 820

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

2014-12-08 Thread Stephen Rothwell
Hi Vinod, Today's linux-next merge of the slave-dma tree got a conflict in drivers/dma/pl330.c between commits ae43b3289186 ("ARM: 8202/1: dmaengine: pl330: Add runtime Power Management support v12") and b816ccc5c01f ("ARM: 8206/1: dmaengine: pl330: Add PM sleep support") from the arm tree and com

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

2012-07-12 Thread Vinod Koul
On Mon, 2012-07-02 at 13:16 +1000, Stephen Rothwell wrote: > Hi Vinod, > > Today's linux-next merge of the slave-dma tree got conflicts in > drivers/dma/Kconfig and drivers/dma/Makefile between commit 06dba53e6fcf > ("dmaengine: add OMAP DMA engine driver") from the arm tree and commit > c6da0ba8d