From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl5tY-0004kI-EP for qemu-devel@nongnu.org; Tue, 18 Dec 2012 17:44:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl5tV-0002OP-DM for qemu-devel@nongnu.org; Tue, 18 Dec 2012 17:44:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl5tV-0002OJ-4C for qemu-devel@nongnu.org; Tue, 18 Dec 2012 17:44:13 -0500 Date: Wed, 19 Dec 2012 00:47:22 +0200 From: "Michael S. Tsirkin" Message-ID: <20121218224721.GA787@redhat.com> References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> <87623z6pr1.fsf@codemonkey.ws> <50D0DBF9.7070108@redhat.com> <87pq27f0om.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87pq27f0om.fsf@codemonkey.ws> Subject: Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Paolo Bonzini , qemu-devel@nongnu.org On Tue, Dec 18, 2012 at 04:35:53PM -0600, Anthony Liguori wrote: > Paolo Bonzini writes: > > > Ok... I had really merged the wrong branch with mst's. I fixed it up and > > pushed again to the same place; it's now commit 6cdf60e, "make check" > > builds and passes. > > > > Here is the diff, sorry for the mistake. > > No problem. I'm processing other pull requests now but will merged this > one tonight after I push the others. > > Michael, I'll still plan on merging your changes through this request so > I won't be processing your pinged pull request since Paolo's contains yours. > > Regards, > > Anthony Liguori This is painful - I hoped for fast merge to reduce conflicts :(. I already got some patches submitted on list that don't apply on my tree. > > > > Paolo > > > > > > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini wrote: > > > >> Il 18/12/2012 21:59, Anthony Liguori ha scritto: > >> > But this series breaks the build of make check. It's not just one test > >> > case but almost every single one. I think you must have eliminated an > >> > implicit include of qemu-common.h which makes PRId64 et al all > >> > undeclared. > >> > > >> > I started fixing this too but it became too much for a merge commit > >> > since it affects almost all tests. > >> > > >> > Can you fixup make check and send this series out? I'll make sure to > >> > check tomorrow and merge your pull request if I see it tomorrow. > >> > Otherwise, let me know when you plan on sending it and I'll make sure to > >> > be available to merge it. > >> > >> Hmm, I must have pushed the wrong branch because I remember this failure. > >> > >> Paolo > >>