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

2013-10-30 Thread Stefano Stabellini
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

2013-10-30 Thread Stefano Stabellini
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

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

2013-10-29 Thread Stephen Rothwell
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 223016339ce7 ("ARM: 7805/1: mm: change max*pfn to include the physical offset of memory") from the arm tree and commit 06e6295bcece ("arm: make SWIOTLB available") from the xen-