[Xen-changelog] [xen stable-4.6] Update QEMU_UPSTREAM_REVISION

[patchbot@xxxxxxx]

commit 426783e661da942f8b7871613479db4daa6a16c3
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue May 10 19:19:36 2016 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue May 10 19:19:36 2016 +0100

    Update QEMU_UPSTREAM_REVISION
---
 Config.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 31c6bf8..3c38f7c 100644
--- a/Config.mk
+++ b/Config.mk
@@ -254,7 +254,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.1
+QEMU_UPSTREAM_REVISION ?= 14a60f98e0cd16e2636afb136129ed7f11cbfce0
+# Tue Apr 26 14:48:06 2016 +0200
+# vga: make sure vga register setup for vbe stays intact (CVE-2016-3712).
 MINIOS_UPSTREAM_REVISION ?= 6aadd46e0927763861b19eacce2f2aeac9f17835
 # Sat, 9 Apr 2016 23:46:32 +0100 (00:46 +0200)
 # Fix time update
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog