From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl6i3-0005Op-0K for qemu-devel@nongnu.org; Tue, 18 Dec 2012 18:36:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl6i1-0000cy-Uk for qemu-devel@nongnu.org; Tue, 18 Dec 2012 18:36:26 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:35640) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl6i1-0000cS-Qa for qemu-devel@nongnu.org; Tue, 18 Dec 2012 18:36:25 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Dec 2012 18:36:21 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 792BA38C801C for ; Tue, 18 Dec 2012 18:36:19 -0500 (EST) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBINaJm4227374 for ; Tue, 18 Dec 2012 18:36:19 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBINaIg6011256 for ; Tue, 18 Dec 2012 21:36:18 -0200 From: Anthony Liguori In-Reply-To: <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> <20121218224721.GA787@redhat.com> Date: Tue, 18 Dec 2012 17:36:13 -0600 Message-ID: <87mwxb53wy.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: "Michael S. Tsirkin" Cc: Paolo Bonzini , qemu-devel@nongnu.org "Michael S. Tsirkin" writes: > 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 :(. Uh, your pull request didn't build so that pretty much eliminates the possibility of a fast merge. It'll get pushed today. It's next inline after the current test run completes. Regards, Anthony Liguori > 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 >> >>