From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl5p1-0003X2-C0 for qemu-devel@nongnu.org; Tue, 18 Dec 2012 17:39:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl5p0-0001GP-2w for qemu-devel@nongnu.org; Tue, 18 Dec 2012 17:39:35 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:56120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl5oz-0001FS-Sl for qemu-devel@nongnu.org; Tue, 18 Dec 2012 17:39:33 -0500 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Dec 2012 15:39:33 -0700 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id F210A19D803E for ; Tue, 18 Dec 2012 15:39:28 -0700 (MST) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBIMdSIT275502 for ; Tue, 18 Dec 2012 15:39:28 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBIMdSdL011120 for ; Tue, 18 Dec 2012 15:39:28 -0700 From: Anthony Liguori In-Reply-To: References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> <87623z6pr1.fsf@codemonkey.ws> <50D0DBF9.7070108@redhat.com> Date: Tue, 18 Dec 2012 16:39:23 -0600 Message-ID: <87mwxbf0is.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: Paolo Bonzini Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" Paolo Bonzini writes: > And how does it conflicts with Alex's ppc pull request? It is a fast > forward from origin/master as of now (commit a8a826a, exec: refactor > cpu_restore_state, 2012-12-04), and that includes Alex's commits... Something from the e500 changes because hw/ppc/e500.c and hw/ppc/e500plat.c broke after the merge. But since it was the wrong tree, maybe your new branch will not have this problem. It was easy to fix, so don't worry about it. I can resolve as a merge conflict if needed. Regards, Anthony Liguori > > 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 >>