update Xen version to 4.6.3

Skipping 4.6.2 due to qemu changes having become necessary after that
tree had got tagged already.

diff --git a/Config.mk b/Config.mk
index 318cbd8e6296fb6844fafa6163c633c248d2cde4..c04a6c22638f5a32bd0fb92047c14e7ecafecd75 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -254,10 +254,10 @@ 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 ?= 7a88f1257d5261a7bee98facdb97f50d5553060e
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.3
 # Wed Sep 16 17:38:44 2015 +0200
 # trace: remove malloc tracing
-MINIOS_UPSTREAM_REVISION ?= e1cca557c64272d33da7bafc0ad25399267563d0
+MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.3
 # Fri May 13 15:21:10 2016 +0100
 # lib/sys.c: enclose file_types in define guards
 
@@ -268,7 +268,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= 29b39dac29529b9989e4f597adb354f7879b6f63
+QEMU_TRADITIONAL_REVISION ?= xen-4.6.3
 # Thu May 19 19:38:35 2016 +0100
 # main loop: Big hammer to fix logfile disk DoS in Xen setups
 

diff --git a/xen/Makefile b/xen/Makefile
index 7620267c6ca0521d0c57b9d256af99c5e63a4bbd..2511c9ae98c771d0becfcd77cee91399017984f4 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 6
-export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version