From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNkXK-0003mb-9G for qemu-devel@nongnu.org; Mon, 15 Oct 2012 09:16:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNkXE-00007g-Im for qemu-devel@nongnu.org; Mon, 15 Oct 2012 09:16:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNkXE-00007R-AG for qemu-devel@nongnu.org; Mon, 15 Oct 2012 09:16:44 -0400 Message-ID: <507C0CB4.4070703@redhat.com> Date: Mon, 15 Oct 2012 15:16:36 +0200 From: Avi Kivity MIME-Version: 1.0 References: <1349800368-15228-1-git-send-email-avi@redhat.com> <87626g3eqj.fsf@codemonkey.ws> In-Reply-To: <87626g3eqj.fsf@codemonkey.ws> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL v3 00/23] Integrate DMA into the memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Blue Swirl , Paolo Bonzini , "Michael S. Tsirkin" , qemu-devel@nongnu.org, liu ping fan 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