From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 11 Mar 2019 14:49:00 +0000 (+0000)
Subject: Branch for 4.12: Switch unstable back from specific 4.12 tags
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ef15ca08a8bb7db95689485af232ae18d40f5356;p=people%2Fliuw%2Fxen.git

Branch for 4.12: Switch unstable back from specific 4.12 tags

Use master or specific git commits.  The only semantic change is to
pick up qemu-xen master again.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/Config.mk b/Config.mk
index 0a2f1f7df8..00cb4f5479 100644
--- a/Config.mk
+++ b/Config.mk
@@ -275,15 +275,15 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= ef529e6ab7c31290a33045bb1f1837447cc0eb56
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.12.0-rc1
-MINIOS_UPSTREAM_REVISION ?= xen-4.12.0-rc1
+QEMU_UPSTREAM_REVISION ?= master
+MINIOS_UPSTREAM_REVISION ?= 0b4b7897e08b967a09bed2028a79fabff82342dd
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.12.0
 
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= xen-4.12.0-rc1
+QEMU_TRADITIONAL_REVISION ?= d0d8ad39ecb51cd7497cd524484fe09f50876798
 # Wed Oct 10 18:52:54 2018 +0000
 # xen/pt: allow QEMU to request MSI unmasking at bind time