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

From: Greg KH
Date: Tue Jul 29 2014 - 11:36:43 EST

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
> 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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at