Re: linux-next: manual merge of the arm-soc tree with the slave_dma and tree

2012-12-03 Thread Greg KH
On Mon, Dec 03, 2012 at 05:12:32PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/dma/mv_xor.c between commit d51e88b99533 ("dma: Convert dev_printk > (KERN_ to dev_(") from the slave-dma tree, commits > a7d6e3ec28bb ("dma: rem

linux-next: manual merge of the arm-soc tree with the slave_dma and tree

2012-12-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/dma/mv_xor.c between commit d51e88b99533 ("dma: Convert dev_printk (KERN_ to dev_(") from the slave-dma tree, commits a7d6e3ec28bb ("dma: remove use of __devexit_p") and 463a1f8b3cee ("dma: remove use of __devinit") fro