Re: linux-next: manual merge of the xen-tip tree with the tree

On Wed, 30 Oct 2013, Stefano Stabellini wrote: > Looks fine thanks! > Just an heads up: I'll be updating the Xen code below soon so this > conflict might come up again. Just to be clear: I meant the dma_capable function. Sorry for top posting. > On Wed, 30 Oct 2013, Stephen Rothwell wrote: > > H

Re: linux-next: manual merge of the xen-tip tree with the tree

Looks fine thanks! Just an heads up: I'll be updating the Xen code below soon so this conflict might come up again. On Wed, 30 Oct 2013, 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 commit 2230163