Update version to Xen 4.6 RC

* Change README to say `Xen 4.6-rc'
* Change XEN_EXTRAVERSION so that we are `4.6.0-rc'

Note that the RC number (eg, 1 for rc1) is not in the version string,
so that we do not need to update this again when we cut the next RC.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/README b/README
index 0e456b8c6161ef185bd5aacf086c37457a84f513..522f1a20b04918c694b985d8e553155db67abf83 100644 (file)
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 #################################
-__  __            _  _    __                         _        _     _      
-\ \/ /___ _ __   | || |  / /_        _   _ _ __  ___| |_ __ _| |__ | | ___ 
- \  // _ \ '_ \  | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
- /  \  __/ | | | |__   _| (_) |_____| |_| | | | \__ \ || (_| | |_) | |  __/
-/_/\_\___|_| |_|    |_|(_)___/       \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
-                                                                           
+__  __            _  _    __
+\ \/ /___ _ __   | || |  / /_        _ __ ___
+ \  // _ \ '_ \  | || |_| '_ \ _____| '__/ __|
+ /  \  __/ | | | |__   _| (_) |_____| | | (__
+/_/\_\___|_| |_|    |_|(_)___/      |_|  \___|
+
 #################################
 
 http://www.xen.org/

diff --git a/xen/Makefile b/xen/Makefile
index 63058803e3a863ee44242d978b332a882b5d3ac6..6088c9d42ccdfa57833b35f78f8a99c0498e5760 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 ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version