Re: [Xen-devel] [PATCH 4.6] Config: Switch to unified qemu trees.

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Wed, 2015-11-18 at 16:06 +0000, Ian Jackson wrote:
> Upstream qemu is now in qemu-xen.git and the trad fork is in
> qemu-xen-traditional.git.
> 
> QEMU_UPSTREAM_REVISION is currently a tag and
> QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are
> required to those.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> 
> Conflicts:
>       Config.mk
> Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

This looks like what my local backport got when I was developing this,
which I erroneously posted as the patch for unstable in [0] so:

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

Are you going to apply this to 4.5 and older now too? Given the obvious
s/4.6/$X.$Y/g on this patch you may keep my ack on those too.

Ian.

[0]Âhttp://lists.xen.org/archives/html/xen-devel/2015-09/msg02160.html

> ---
> ÂConfig.mk |ÂÂÂÂ8 ++++----
> Â1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Config.mk b/Config.mk
> index 659d94d..ac7332b 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -242,14 +242,14 @@ endif
> Â
> Âifeq ($(GIT_HTTP),y)
> ÂOVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git
> -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.6-t
> esting.git
> -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.6-tes
> ting.git
> +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git
> +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-traditi
> onal.git
> ÂSEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
> ÂMINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git
> Âelse
> ÂOVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
> -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.6-testing.git
> -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.6-testing.git
> +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git
> +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git
> ÂSEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
> ÂMINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
> Âendif

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel