Re: [Qemu-devel] [PULL v3 00/23] Integrate DMA into the memory API

[Avi Kivity]

On 10/11/2012 11:01 PM, Anthony Liguori wrote:
> This conflicts with a recent pull from Stefano in xen-all.c.  The
> difference doesn't look that awful but since I don't have a xen test
> setup, I'm not confident in resolving it myself.
> 
> Can you rebase and fixup?
> 

Rebased tree in the same place:

  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/dma



-- 
error compiling committee.c: too many arguments to function