From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqeUF-0005CG-FQ for qemu-devel@nongnu.org; Wed, 11 Dec 2013 02:45:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqeU6-0003PU-UE for qemu-devel@nongnu.org; Wed, 11 Dec 2013 02:45:39 -0500 Received: from mail-ee0-x22e.google.com ([2a00:1450:4013:c00::22e]:65086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqeU6-0003PP-IK for qemu-devel@nongnu.org; Wed, 11 Dec 2013 02:45:30 -0500 Received: by mail-ee0-f46.google.com with SMTP id d49so2670684eek.19 for ; Tue, 10 Dec 2013 23:45:29 -0800 (PST) Sender: Paolo Bonzini Message-ID: <52A8180F.9010806@redhat.com> Date: Wed, 11 Dec 2013 08:45:19 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1386622112-27257-1-git-send-email-pbonzini@redhat.com> <8738m0jlek.fsf@codemonkey.ws> In-Reply-To: <8738m0jlek.fsf@codemonkey.ws> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 00/30] virtio conversion to realize and hotplug/unplug fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: cornelia.huck@de.ibm.com, mst@redhat.com, qemu-devel@nongnu.org, afaerber@suse.de Il 11/12/2013 01:12, Anthony Liguori ha scritto: > Paolo Bonzini writes: > >> Anthony, >> >> the following changes since commit 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e: >> >> Open 2.0 development tree (2013-11-27 14:02:45 -0800) > > This also conflicts badly. This doesn't conflict here either. What files are conflicting exactly? Paolo