README, Makefiles, Config.mk: Update for branching 4.11 vs 4.12-unstable

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

diff --git a/Config.mk b/Config.mk
index 9183496bbe2193db92145c84dc6147b42f939a55..0e829bb364f6eca2598b3863180246c3d1d923a8 100644 (file)
--- 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 ?= 947f3737abf65fda63f3ffd97fddfa6986986868
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.11.0-rc6
-MINIOS_UPSTREAM_REVISION ?= xen-4.11.0-rc1.1
+QEMU_UPSTREAM_REVISION ?= master
+MINIOS_UPSTREAM_REVISION ?= 0b4b7897e08b967a09bed2028a79fabff82342dd
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.11.1
 
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= xen-4.11.0-rc1
+QEMU_TRADITIONAL_REVISION ?= c8ea0457495342c417c3dc033bba25148b279f60
 # Fri Sep 15 19:37:27 2017 +0100
 # qemu-xen-traditional: Link against xentoolcore
 

diff --git a/README b/README
index 3cbccf3c4872df3be50d5756f156b4c73eab43d6..4b95b21c7b2d4adfed83c28bd96401e57a49d199 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 #################################
-__  __            _  _    _ _
-\ \/ /___ _ __   | || |  / / |      _ __ ___
- \  // _ \ '_ \  | || |_ | | |_____| '__/ __|
- /  \  __/ | | | |__   _|| | |_____| | | (__
-/_/\_\___|_| |_|    |_|(_)_|_|     |_|  \___|
+ _  _    _ ____                       _        _     _
+| || |  / |___ \      _   _ _ __  ___| |_ __ _| |__ | | ___
+| || |_ | | __) |____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
+|__   _|| |/ __/_____| |_| | | | \__ \ || (_| | |_) | |  __/
+   |_|(_)_|_____|     \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
 
 #################################
 

diff --git a/SUPPORT.md b/SUPPORT.md
index 9eb695858c7fa485757dd36cfb6e185f5ee9a97d..01cc728e3ffef973632b904336e0fd816d41f815 100644 (file)
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -9,7 +9,7 @@ for the definitions of the support status levels etc.
 
 # Release Support
 
-    Xen-Version: 4.11-unstable
+    Xen-Version: 4.12-unstable
     Initial-Release: n/a
     Supported-Until: TBD
     Security-Support-Until: Unreleased - not yet security-supported

diff --git a/xen/Makefile b/xen/Makefile
index 60867e31a46d76f78033a71b2b0261ef1c6b7600..abbf1d70ff3611e68ae07d131e06bce9492ac6b2 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -1,8 +1,8 @@
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
-export XEN_SUBVERSION    = 11
-export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION)
+export XEN_SUBVERSION    = 12
+export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version