From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQEPw-0005rJ-Ou for qemu-devel@nongnu.org; Mon, 22 Oct 2012 05:35:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQEPv-0001Sg-Nm for qemu-devel@nongnu.org; Mon, 22 Oct 2012 05:35:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQEPv-0001Sa-Fj for qemu-devel@nongnu.org; Mon, 22 Oct 2012 05:35:27 -0400 Message-ID: <50851358.4020202@redhat.com> Date: Mon, 22 Oct 2012 11:35:20 +0200 From: Avi Kivity MIME-Version: 1.0 References: <1349800368-15228-1-git-send-email-avi@redhat.com> <87626g3eqj.fsf@codemonkey.ws> <507C0CB4.4070703@redhat.com> In-Reply-To: <507C0CB4.4070703@redhat.com> 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/15/2012 03:16 PM, Avi Kivity wrote: > 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 > Anthony, or Blue, can you pull please? The neighbours are starting to complain about the smell. -- error compiling committee.c: too many arguments to function