From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KQl3H-0003QT-FK for qemu-devel@nongnu.org; Wed, 06 Aug 2008 11:35:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KQl3G-0003PF-Qx for qemu-devel@nongnu.org; Wed, 06 Aug 2008 11:35:51 -0400 Received: from [199.232.76.173] (port=53545 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KQl3G-0003P4-Ll for qemu-devel@nongnu.org; Wed, 06 Aug 2008 11:35:50 -0400 Received: from mx1.redhat.com ([66.187.233.31]:33410) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KQl3G-0008MC-Fk for qemu-devel@nongnu.org; Wed, 06 Aug 2008 11:35:50 -0400 Message-ID: <4899C4CB.2020105@redhat.com> Date: Wed, 06 Aug 2008 17:35:39 +0200 From: Gerd Hoffmann MIME-Version: 1.0 Subject: Re: [Xen-devel] Re: [Qemu-devel] [PATCH 0/7] merge some xen bits into qemu 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> <20080806142526.GN4448@implementation.uk.xensource.com> In-Reply-To: <20080806142526.GN4448@implementation.uk.xensource.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Samuel Thibault , Gerd Hoffmann , Markus Armbruster , Anthony Liguori , qemu-devel@nongnu.org, xen-devel@lists.xensource.com, Ian Jackson Samuel Thibault wrote: > Gerd Hoffmann, le Wed 06 Aug 2008 16:08:47 +0200, a =E9crit : >> Samuel Thibault wrote: >>> Gerd Hoffmann, le Wed 06 Aug 2008 15:54:33 +0200, a =E9crit : >>>> IMHO the best way to address this issue is to rebase frequently. >>> Then why not pushing the changes to xen repositories in the first pla= ce? >> Because I want have xen support in *upstream* qemu. >=20 > 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 pus= h > them to qemu-devel? Most of the patches probably to both qemu-devel and xen-devel. Stuff unrelated to xen (say e1000 emulation bugs) qemu-devel only. > 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? >=20 >>>> 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-d= m >>>> 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. >=20 > AGAIN, THERE IS THE IAN JACKSON TREE. > > Thanks for reading. I get build failures when patching THE IAN JACKSON TREE due to THE IAN JACKSON TREE lagging behind upstream. I can read, thank you. Please stop crying. > Ian has _already_ done that hard work. Oh, rebasing isn't a one-shot thing. You have to do it over and over again. Unless you get your code upstream of course. cheers, Gerd --=20 http://kraxel.fedorapeople.org/xenner/