From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KQjxC-0002Mw-0G for qemu-devel@nongnu.org; Wed, 06 Aug 2008 10:25:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KQjxA-0002MW-8M for qemu-devel@nongnu.org; Wed, 06 Aug 2008 10:25:29 -0400 Received: from [199.232.76.173] (port=58280 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KQjx9-0002MR-Tp for qemu-devel@nongnu.org; Wed, 06 Aug 2008 10:25:28 -0400 Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:7941 helo=SMTP.EU.CITRIX.COM) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KQjx9-0003GL-M4 for qemu-devel@nongnu.org; Wed, 06 Aug 2008 10:25:27 -0400 Date: Wed, 6 Aug 2008 15:25:26 +0100 From: Samuel Thibault Subject: Re: [Xen-devel] Re: [Qemu-devel] [PATCH 0/7] merge some xen bits into qemu Message-ID: <20080806142526.GN4448@implementation.uk.xensource.com> References: <48985336.2020709@redhat.com> <20080805150328.GT4478@implementation.uk.xensource.com> <20080805154140.GV4478@implementation.uk.xensource.com> <48997981.1030703@redhat.com> <20080806102338.GA4448@implementation.uk.xensource.com> <20080806125055.GG4448@implementation.uk.xensource.com> <4899AD19.8060606@redhat.com> <20080806140132.GL4448@implementation.uk.xensource.com> <4899B06F.2090101@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <4899B06F.2090101@redhat.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: xen-devel@lists.xensource.com, Ian Jackson , Markus Armbruster , qemu-devel@nongnu.org Gerd Hoffmann, le Wed 06 Aug 2008 16:08:47 +0200, a écrit : > Samuel Thibault wrote: > > Gerd Hoffmann, le Wed 06 Aug 2008 15:54:33 +0200, a écrit : > >> IMHO the best way to address this issue is to rebase frequently. > > > > Then why not pushing the changes to xen repositories in the first place? > > Because I want have xen support in *upstream* qemu. I know, but you are basically saying "ok, guys, you'll just manage the breakage of the big merge, thanks", that's not very convenient, to say the least. For instance, where should fix patches be sent to? Both qemu-devel and xen-devel? Just xen-devel and thus make Ian have to push them to qemu-devel? Pushing the cleaning changes to Xen first can be done and would entail much easier to tackle breakage, and the merge back from qemu would then be trivial, why not doing so? > >> I'm trying to fiddle my bits into qemu-dm right now. One problem is > >> that I get build failures simply because of the fact that the qemu-dm > >> base is old compared to upstream qemu. > > > > Use Ian Jackson's tree! > > Adapt my patches to an oldish qemu fork, so they must be adapted again > for submitting upstream? No, thank you. AGAIN, THERE IS THE IAN JACKSON TREE. Thanks for reading. Ian has _already_ done that hard work. Samuel