From patchwork Tue Jun 7 13:55:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9161399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE53E60571 for ; Tue, 7 Jun 2016 13:59:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE3DF22A2A for ; Tue, 7 Jun 2016 13:59:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C26ED269A3; Tue, 7 Jun 2016 13:59:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 416F622A2A for ; Tue, 7 Jun 2016 13:59:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAHTt-0005i6-8L; Tue, 07 Jun 2016 13:55:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAHTs-0005hz-1j for xen-devel@lists.xenproject.org; Tue, 07 Jun 2016 13:55:44 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 21/59-32412-F52D6575; Tue, 07 Jun 2016 13:55:43 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHIsWRWlGSWpSXmKPExsXitHSDvW7cpbB wg2sdlhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0ZreytjwTm5imdb5zI3MB4V72Lk4JAQ8Jc4 tN64i5GTg01AV+LStInMIDavgKDEyZlPWEBsZgEdiQW7P7FB2PIS29/OgapxkFg2tZEdxGYRU JG4uukkK8hIEaCam19FIMpVJE7N6wIbIyxgILFlxn4WkBJOAUeJLQv0QUwhoCnX7uiAVEgIGE usvv+RBSKsJjF3fTzEidwSf7vtJzDyz0Jy2Swkl81CctkCRuZVjOrFqUVlqUW6RnpJRZnpGSW 5iZk5uoYGpnq5qcXFiempOYlJxXrJ+bmbGIFhxwAEOxi//3E6xCjJwaQkyvvQOyxciC8pP6Uy I7E4I76oNCe1+BCjBgeHQN/nCYuYpFjy8vNSlSR4Cy8C1QkWpaanVqRl5gAjA6ZUgoNHSYTXA yTNW1yQmFucmQ6ROsWoKCXOWw6SEABJZJTmwbXBovESo6yUMC8j0FFCPAWpRbmZJajyrxjFOR iVhHn9QKbwZOaVwE1/BbSYCWjxsmvBIItLEhFSUg2M1WycWvdYIx+l9T4wZorT6Qnlkfyx7m/ eKlMHvoN2baxPIzO6jz5YIv8nrdj8SYBzhfy0u8e+Pd4S6hT77tWGjuXPdltvmMSqFPBitX6p 0Tzdbd8SNjf1cp66snD+DWdFIe3Fdm0KjckfQ6pbT7gtm1O3aeG9xyWq7OvKF6z3L9mcbf1EU 3qREktxRqKhFnNRcSIAtSPjlMECAAA= X-Env-Sender: prvs=959bd0d79=Ian.Jackson@citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1465307741!27611640!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29640 invoked from network); 7 Jun 2016 13:55:42 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Jun 2016 13:55:42 -0000 X-IronPort-AV: E=Sophos;i="5.26,433,1459814400"; d="scan'208";a="365736892" From: Ian Jackson MIME-Version: 1.0 Message-ID: <22358.53851.305858.396704@mariner.uk.xensource.com> Date: Tue, 7 Jun 2016 14:55:39 +0100 To: In-Reply-To: <22358.51377.974810.863351@mariner.uk.xensource.com> References: <22358.51377.974810.863351@mariner.uk.xensource.com> X-Mailer: VM 8.1.0 under 23.4.1 (i486-pc-linux-gnu) X-DLP: MIA1 Cc: xen-devel@lists.xenproject.org Subject: Re: [Xen-devel] Commit moratorium for branching 4.7 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 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 CC: Wei Liu --- 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