From patchwork Thu Jan 14 16:44:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8034041 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 55ED7BEEE5 for ; Thu, 14 Jan 2016 16:47:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86CBF20499 for ; Thu, 14 Jan 2016 16:47:05 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F50420497 for ; Thu, 14 Jan 2016 16:47:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aJl0T-000267-FV; Thu, 14 Jan 2016 16:44:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aJl0R-00025z-Jt for xen-devel@lists.xenproject.org; Thu, 14 Jan 2016 16:44:15 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 4B/A2-09708-E50D7965; Thu, 14 Jan 2016 16:44:14 +0000 X-Env-Sender: prvs=8142b73fb=Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1452789852!10131642!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57199 invoked from network); 14 Jan 2016 16:44:13 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 14 Jan 2016 16:44:13 -0000 X-IronPort-AV: E=Sophos;i="5.22,295,1449532800"; d="scan'208";a="325218018" Message-ID: <1452789850.32341.14.camel@citrix.com> From: Ian Campbell To: Jan Beulich , Roger Pau Monne Date: Thu, 14 Jan 2016 16:44:10 +0000 In-Reply-To: <1452782697.2185.39.camel@citrix.com> References: <1452771149-73095-1-git-send-email-roger.pau@citrix.com> <5697AA1702000078000C6BCE@prv-mh.provo.novell.com> <1452782697.2185.39.camel@citrix.com> X-Mailer: Evolution 3.18.2-1 MIME-Version: 1.0 X-DLP: MIA1 Cc: xen-devel@lists.xenproject.org, Keir Fraser , Ian Jackson , Tim Deegan Subject: Re: [Xen-devel] [PATCH] Config.mk: Update SEABIOS_UPSTREAM_TAG to 442502 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, 2016-01-14 at 14:44 +0000, Ian Campbell wrote: > On Thu, 2016-01-14 at 06:00 -0700, Jan Beulich wrote: > > > > > On 14.01.16 at 12:32, wrote: > > > --- a/Config.mk > > > +++ b/Config.mk > > > @@ -255,9 +255,10 @@ MINIOS_UPSTREAM_REVISION ?= > > > d25773c8afa2f4dbbb466116daeb60159ddd22bd > > >  # Thu Dec 3 11:23:25 2015 +0000 > > >  # mini-os: Include libxentoollog with libxc > > >   > > > -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 > > > -# Tue Nov 17 09:18:44 2015 -0500 > > > -# docs: Note v1.9.0 release > > > +SEABIOS_UPSTREAM_REVISION ?= > > > 44250252eeaefd5e81bae2f73639bd323682217b > > > +# Thu Jan 7 12:02:51 2016 -0500 > > > +# tpm: Do not set TPM in failure mode if menu command fails > > > +# NB: we should try to update to a rel-* version before releasing > > > Xen. > > > > Assuming they cut a 1.9.1 by then including that fix, won't we risk > > moving backwards in that case? Wouldn't it be better in such a > > situation to follow the ipxe model and apply patches on top of the > > most recent release? > > Good point. > > I shall drop seabios-devel a line re 1.9.1 or 1.10.0 and see what's what. In response to my line there is now 1.9-stable branch in seabios.git, which contains just the patch of interest. I propose we update to that branch, as below (+ appropriate pushes to our seabios.git tree to make the branch appear there). Ian. commit a661f70a8aad3fe7b2c828632714785a04b1d96b Author: Ian Campbell Date:   Thu Jan 14 16:43:42 2016 +0000     SEABIOS_UPSTREAM_REVISION Update          Signed-off-by: Ian Campbell Acked-by: Roger Pau Monné Acked-by: Roger Pau Monné diff --git a/Config.mk b/Config.mk index 62f8209..d654af8 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd  # Thu Dec 3 11:23:25 2015 +0000  # mini-os: Include libxentoollog with libxc   -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 -# Tue Nov 17 09:18:44 2015 -0500 -# docs: Note v1.9.0 release +SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab +# Mon Dec 28 13:50:41 2015 +0100 +# build: fix typo in buildversion.py    ETHERBOOT_NICS ?= rtl8139 8086100e