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 95b4ecbf759a ("dma: MIC X100 DMA Driver") from the char-misc > tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html