xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Jackson <Ian.Jackson@eu.citrix.com>
To: committers@xenproject.org
Cc: xen-devel@lists.xenproject.org
Subject: Re: Commit moratorium for branching 4.7
Date: Tue, 7 Jun 2016 14:55:39 +0100	[thread overview]
Message-ID: <22358.53851.305858.396704@mariner.uk.xensource.com> (raw)
In-Reply-To: <22358.51377.974810.863351@mariner.uk.xensource.com>

Ian Jackson writes ("Commit moratorium for branching 4.7"):
> At Wei's request, I am starting to branch the tree, so that
> xen-unstable can diverge from the *-4.7 preparation branches.
> 
> Please don't commit anything until I'm done, which will be later
> today.

I have now finished this branching process.  Please let me know of any
anomalies.  I have applied the patch below to xen.git#staging, to
(from a technical point of view) open Xen 4.8.

I'm not sure we have made a community decision about the terms under
which patches may be committed to the newly-open 4.8 (and who is
responsible for porting bug fixes from 4.7 to 4.8 or vice versa).
Perhaps I missed the email.  I don't think the stable tree maintainers
want to take over 4.7 yet.  So until that is settled, probably nothing
substantial should be committed to 4.8.

Commits for 4.7 should now go to xen.git#staging-4.7, on the same
terms as before.  (Ie, with Wei's approval.)

The branching process did not involve pushing any change to any of the
4.7 git branches.

Ian.


From 936a7a5483fbdd4ae3d813beff8921e902f43a46 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 7 Jun 2016 14:49:31 +0100
Subject: [PATCH] Open Xen 4.8-unstable

* Change version number in README and xen/Makefile to `4.8-unstable'.
* Set `debug ?= y'.
* Set QEMU_UPSTREAM_REVISION to track qemu-xen.git `master'.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
 Config.mk    |    4 ++--
 README       |   12 ++++++------
 xen/Makefile |    4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Config.mk b/Config.mk
index bc5c456..e083727 100644
--- a/Config.mk
+++ b/Config.mk
@@ -17,7 +17,7 @@ or       = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$(
 -include $(XEN_ROOT)/.config
 
 # A debug build of Xen and tools?
-debug ?= n
+debug ?= y
 debug_symbols ?= $(debug)
 
 # Test coverage support
@@ -272,7 +272,7 @@ 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.7.0-rc5
+QEMU_UPSTREAM_REVISION ?= master
 MINIOS_UPSTREAM_REVISION ?= 1a3ee6eeca136525aa2e6917ae500e7cf731c09d
 # Fri May 13 15:21:10 2016 +0100
 # lib/sys.c: enclose file_types in define guards
diff --git a/README b/README
index d3f432a..e1ac04a 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 #################################
-__  __            _  _   _____              
-\ \/ /___ _ __   | || | |___  |    _ __ ___ 
- \  // _ \ '_ \  | || |_   / /____| '__/ __|
- /  \  __/ | | | |__   _| / /_____| | | (__ 
-/_/\_\___|_| |_|    |_|(_)_/      |_|  \___|
-                                            
+__  __            _  _    ___                        _        _     _      
+\ \/ /___ _ __   | || |  ( _ )       _   _ _ __  ___| |_ __ _| |__ | | ___ 
+ \  // _ \ '_ \  | || |_ / _ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
+ /  \  __/ | | | |__   _| (_) |_____| |_| | | | \__ \ || (_| | |_) | |  __/
+/_/\_\___|_| |_|    |_|(_)___/       \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
+                                                                           
 #################################
 
 http://www.xen.org/
diff --git a/xen/Makefile b/xen/Makefile
index b59f95d..ee8ce8e 100644
--- 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    = 7
-export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
+export XEN_SUBVERSION    = 8
+export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version
 
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

       reply	other threads:[~2016-06-07 13:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <22358.51377.974810.863351@mariner.uk.xensource.com>
2016-06-07 13:55 ` Ian Jackson [this message]
2016-06-07 14:26   ` Commit moratorium for branching 4.7 Jan Beulich
2016-06-07 14:41     ` George Dunlap
2016-06-07 15:55       ` Ian Jackson
2016-06-07 16:00   ` Wei Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=22358.53851.305858.396704@mariner.uk.xensource.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=committers@xenproject.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).