From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLcz-0007Bm-K8 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:32:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlLcv-0000k3-FA for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:32:13 -0500 Received: from mail-ia0-f178.google.com ([209.85.210.178]:50456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLcv-0000jy-BB for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:32:09 -0500 Received: by mail-ia0-f178.google.com with SMTP id k25so1800774iah.23 for ; Wed, 19 Dec 2012 07:32:08 -0800 (PST) Sender: Paolo Bonzini Message-ID: <50D1DDF3.6090307@redhat.com> Date: Wed, 19 Dec 2012 16:32:03 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> <87623z6pr1.fsf@codemonkey.ws> <50D0DBF9.7070108@redhat.com> <87mwxbf0is.fsf@codemonkey.ws> In-Reply-To: <87mwxbf0is.fsf@codemonkey.ws> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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: qemu-devel@nongnu.org, "Michael S. Tsirkin" Il 18/12/2012 23:39, Anthony Liguori ha scritto: >> > 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. Pushed. Paolo