From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lwvef-0006JT-8c for qemu-devel@nongnu.org; Thu, 23 Apr 2009 05:55:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lwvea-0006IN-GW for qemu-devel@nongnu.org; Thu, 23 Apr 2009 05:55:40 -0400 Received: from [199.232.76.173] (port=59898 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lwvea-0006II-Al for qemu-devel@nongnu.org; Thu, 23 Apr 2009 05:55:36 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56927) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LwveZ-0003dX-QC for qemu-devel@nongnu.org; Thu, 23 Apr 2009 05:55:36 -0400 Message-ID: <49F03B0E.1060108@redhat.com> Date: Thu, 23 Apr 2009 11:55:26 +0200 From: Gerd Hoffmann MIME-Version: 1.0 Subject: Re: [Xen-devel] Re: [Qemu-devel] [PATCH 00/10] xen: pv domain support. References: <1240316408-15949-1-git-send-email-kraxel@redhat.com> <49EF3D28.50003@codemonkey.ws> <49EF4BCB.5020301@eu.citrix.com> In-Reply-To: <49EF4BCB.5020301@eu.citrix.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefano Stabellini Cc: "xen-devel@lists.xensource.com" , "qemu-devel@nongnu.org" Hi, > The point was for Ian to be able to pull directly from qemu without > getting any conflicts on those files. > To be honest they are fairly similar now, so I am confident that git > will be able to do its magic. Ian can merge the changes from my repo first, then upstream qemu. Maybe the later splitted into the first four patches (the stuff already in qemu-xen) and then the remaining bits (disk+nic backend & friends) which Ian wants to get via upstream qemu. That should work out well. cheers, Gerd