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

2014-08-05 Thread Vinod Koul
On Tue, Aug 05, 2014 at 04:28:43PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/dma/Makefile between commit b45b262cefd5 ("dmaengine: add a > driver for AMBA AXI NBPF DMAC IP cores") from the slave-dma tree and > commit 95b

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

2014-08-05 Thread Greg KH
On Tue, Aug 05, 2014 at 04:28:43PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/dma/Makefile between commit b45b262cefd5 ("dmaengine: add a > driver for AMBA AXI NBPF DMAC IP cores") from the slave-dma tree and > commit 95b

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

2014-07-29 Thread Greg KH
On Tue, Jul 29, 2014 at 05:38:24PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/dma/Makefile between commit 555859308723 ("dmaengine: sun6i: > Add driver for the Allwinner A31 DMA controller") from the slave-dma tree and >