Messages in this thread | | | Subject | Re: linux-next: manual merge of the slave-dma tree with the s5p tree | From | Vinod Koul <> | Date | Wed, 23 Nov 2011 16:58:41 +0530 |
| |
On Mon, 2011-11-21 at 11:08 +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 commit fc0b5cccc8dd ("DMA: PL330: Infer > transfer direction from transfer request instead of platform data") from > the s5p tree and commit db8196df4bb6 ("dmaengine: move drivers to > dma_transfer_direction") from the slave-dma tree. > > The former removed the code modified by the latter, so I did that.
Thanks Stephan,
It seems to be the right fix
-- ~Vinod
| |