From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH 2/4] Update version to Xen 4.6 RC
Date: Tue, 11 Aug 2015 15:32:26 +0100
Message-ID: <1439303546.9747.269.camel@citrix.com>
References: <1439302160-24633-1-git-send-email-ian.jackson@eu.citrix.com>
	<1439302160-24633-3-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1439302160-24633-3-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Jackson <ian.jackson@eu.citrix.com>, xen-devel@lists.xensource.com
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Wei Liu <wei.liu2@citrix.com>, Jan Beulich <jbeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

On Tue, 2015-08-11 at 15:09 +0100, Ian Jackson wrote:
> * 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>
> CC: Jan Beulich <jbeulich@suse.com>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> CC: Wei Liu <wei.liu2@citrix.com>
> ---
>  README       |   12 ++++++------
>  xen/Makefile |    2 +-
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/README b/README
> index 0e456b8..522f1a2 100644
> --- a/README
> +++ b/README
> @@ -1,10 +1,10 @@
>  #################################
> -__  __            _  _    __                         _        _     _   
>    
> -\ \/ /___ _ __   | || |  / /_        _   _ _ __  ___| |_ __ _| |__ | | 
> ___ 
> - \  // _ \ '_ \  | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ 
> _ \
> - /  \  __/ | | | |__   _| (_) |_____| |_| | | | \__ \ || (_| | |_) | | 
>  __/
> -/_/\_\___|_| |_|    |_|(_)___/       \__,_|_| 
> |_|___/\__\__,_|_.__/|_|\___|
> -                                                                        
>    
> +__  __            _  _    __
> +\ \/ /___ _ __   | || |  / /_        _ __ ___
> + \  // _ \ '_ \  | || |_| '_ \ _____| '__/ __|
> + /  \  __/ | | | |__   _| (_) |_____| | | (__
> +/_/\_\___|_| |_|    |_|(_)___/      |_|  \___|
> +
>  #################################
>  
>  http://www.xen.org/
> diff --git a/xen/Makefile b/xen/Makefile
> index 6305880..6088c9d 100644
> --- 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
>