All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Jackson <Ian.Jackson@eu.citrix.com>
To: Ian Campbell <ian.campbell@citrix.com>
Cc: stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com,
	xen-devel@lists.xen.org
Subject: Re: [PATCH XEN] Config: Switch to unified qemu trees.
Date: Thu, 17 Sep 2015 11:32:15 +0100	[thread overview]
Message-ID: <22010.38575.976988.184425@mariner.uk.xensource.com> (raw)
In-Reply-To: <1442482663-32437-1-git-send-email-ian.campbell@citrix.com>

Ian Campbell writes ("[PATCH XEN] Config: Switch to unified qemu trees."):
> Upstream qemu is not in qemu-xen.git and the trad fork is in
> qemu-xen-traditional.h
> 
> QEMU_UPSTREAM_REVISION is currently a tag and
> QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are
> required to those.

When this is backported, something will have to be done about that, of
course.  Otherwise stable branches might pick up qemu-*#master

> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> (cherry picked from commit dff5c395c1d23c21238ce17ddcd6f7abe2efd08d)
> 
> Conflicts:
> 	Config.mk

Did you intend that to appear here ?

Ian.

  reply	other threads:[~2015-09-17 10:32 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-17  9:37 [PATCH OSSTEST+XEN 0/1+1] Switching to one qemu tree per qemu version (trad vs upstream) Ian Campbell
2015-09-17  9:37 ` [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees Ian Campbell
2015-09-17 10:31   ` Ian Jackson
2015-09-17 10:43     ` Ian Campbell
2015-09-17 10:47       ` Ian Campbell
2015-10-02 13:43         ` Ian Jackson
2015-10-02 13:53           ` Ian Campbell
2015-10-05 16:39             ` Ian Jackson
2015-10-19 11:44             ` Ian Jackson
2015-10-20 10:34               ` Ian Campbell
2015-10-21 10:16                 ` Ian Campbell
2015-10-21 10:35                   ` Ian Jackson
2015-10-21 10:50                     ` Ian Campbell
2015-10-21 11:07                 ` Ian Campbell
2015-10-21 13:15                 ` Ian Campbell
2015-10-21 13:25                   ` Ian Campbell
2015-10-21 14:12                   ` Ian Campbell
2015-10-21 14:23                     ` Ian Campbell
2015-10-29 15:24                   ` Ian Jackson
2015-09-17  9:37 ` [PATCH XEN] Config: Switch to unified qemu trees Ian Campbell
2015-09-17 10:32   ` Ian Jackson [this message]
2015-09-17 10:41     ` Ian Campbell
2015-10-16 11:34       ` Ian Jackson
2015-10-21 13:18         ` Ian Campbell
2015-09-17 10:23 ` [PATCH OSSTEST+XEN 0/1+1] Switching to one qemu tree per qemu version (trad vs upstream) Ian Jackson
2015-09-17 10:36   ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=22010.38575.976988.184425@mariner.uk.xensource.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.