From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH XEN] Config: Switch to unified qemu trees. Date: Wed, 21 Oct 2015 14:18:34 +0100 Message-ID: <1445433514.9563.145.camel@citrix.com> References: <1442482630.18856.145.camel@citrix.com> <1442482663-32437-1-git-send-email-ian.campbell@citrix.com> <22010.38575.976988.184425@mariner.uk.xensource.com> <1442486509.18856.166.camel@citrix.com> <22048.57565.997328.213183@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <22048.57565.997328.213183@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Jackson Cc: stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Fri, 2015-10-16 at 12:34 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [PATCH XEN] Config: Switch to unified qemu > trees."): > > > From dff5c395c1d23c21238ce17ddcd6f7abe2efd08d Mon Sep 17 00:00:00 > > > 2001 > > From: Ian Campbell > > Date: Thu, 10 Sep 2015 14:31:34 +0100 > > Subject: [PATCH] Config: Switch to unified qemu trees. > > > > Upstream qemu is now in qemu-xen.git and the trad fork is in > > qemu-xen-traditional.h > > As you say on irc, you mean .git. > > > QEMU_UPSTREAM_REVISION is currently a tag and > > QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are > > required to those. > > Apart from that, > > Acked-by: Ian Jackson As I've just announce separately this is now done and this patch is in the tree. Please can you queue this up for backport back to 4.2. It will conflict at every step, due to the version number in the old URLs, but you can trivially take the new version in every case. It would be worth double checking that the REVISION variables point to a sha1 or to a tag and not to a branch name. I believe this is the case in all stable branches. Ian.