Re: [Xen-devel] linux-next: manual merge of the xen-tip tree with the arm-soc tree

On Mon, Dec 08, 2014 at 07:49:08AM +, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xen-tip tree got a conflict in > arch/arm/include/asm/dma-mapping.h between commits a3a60f81ee6f > ("dma-mapping: replace set_arch_dma_coherent_ops with > arch_setup_dma_ops") and 4bb257

[Xen-devel] linux-next: manual merge of the xen-tip tree with the arm-soc tree

Hi all, Today's linux-next merge of the xen-tip tree got a conflict in arch/arm/include/asm/dma-mapping.h between commits a3a60f81ee6f ("dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops") and 4bb25789ed28 ("arm: dma-mapping: plumb our iommu mapping ops into arch_setup_dma_ops