From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KXz40-0005Bc-RW
	for qemu-devel@nongnu.org; Tue, 26 Aug 2008 09:58:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KXz40-0005Ai-5C
	for qemu-devel@nongnu.org; Tue, 26 Aug 2008 09:58:28 -0400
Received: from [199.232.76.173] (port=54767 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KXz3z-0005AY-VU
	for qemu-devel@nongnu.org; Tue, 26 Aug 2008 09:58:28 -0400
Received: from mx2.redhat.com ([66.187.237.31]:36886)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kraxel@redhat.com>) id 1KXz3z-0007mS-NC
	for qemu-devel@nongnu.org; Tue, 26 Aug 2008 09:58:28 -0400
Message-ID: <48B40B98.1080103@redhat.com>
Date: Tue, 26 Aug 2008 15:56:40 +0200
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 13/13] xen: pv domain builder.
References: <1219336054-15919-1-git-send-email-kraxel@redhat.com>	<m2n.s.1KWDfC-002TCd@chiark.greenend.org.uk>	<m2n.s.1KWDGv-002TBJ@chiark.greenend.org.uk>	<m2n.s.1KWDEt-002TBA@chiark.greenend.org.uk>	<18611.56835.635884.646447@mariner.uk.xensource.com>	<48B3FD5A.4040005@redhat.com>
	<18612.439.24867.23222@mariner.uk.xensource.com>
In-Reply-To: <18612.439.24867.23222@mariner.uk.xensource.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: xen-devel@lists.xensource.com, qemu-devel@nongnu.org

>> If the patches break something, report it and I'll fix it up.
>> "I'm afraid something might break" doesn't help us going forward.
> 
> What I meant is that if your changes are committed to qemu upstream, I
> will get an enormous pile of merge conflicts when I try to merge from
> upstream into our tree.

What do you think about the merge plan outlined in
http://lists.xensource.com/archives/html/xen-devel/2008-08/msg00887.html
That should avoid the enormous pile of merge conflicts, right?

cheers,
  Gerd