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

On Thu, Mar 19, 2015 at 02:48:34PM +1100, Stephen Rothwell wrote: > Hi Mark, > > Today's linux-next merge of the spi tree got conflicts in > drivers/dma/intel_mid_dma_regs.h and drivers/dma/intel_mid_dma.c > between commit 3b62286d0ef7 ("dmaengine: Remove FSF mailing addresses") > from the slave-d

linux-next: manual merge of the spi tree with the slave-dma tree

Hi Mark, Today's linux-next merge of the spi tree got conflicts in drivers/dma/intel_mid_dma_regs.h and drivers/dma/intel_mid_dma.c between commit 3b62286d0ef7 ("dmaengine: Remove FSF mailing addresses") from the slave-dma tree and commit 36111da7838e ("dmaengine: intel-mid-dma: remove the driver"