From patchwork Thu Jan 7 15:47:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 7978231 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 7975BBEEE5 for ; Thu, 7 Jan 2016 15:49:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A587920103 for ; Thu, 7 Jan 2016 15:49:57 +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 CFC30200FE for ; Thu, 7 Jan 2016 15:49:56 +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 1aHCmP-0000Y4-CL; Thu, 07 Jan 2016 15:47:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHCmN-0000Xz-Lv for xen-devel@lists.xen.org; Thu, 07 Jan 2016 15:47:11 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id F8/FE-16870-E788E865; Thu, 07 Jan 2016 15:47:10 +0000 X-Env-Sender: prvs=807bdda5f=Ian.Jackson@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1452181626!14260564!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7131 invoked from network); 7 Jan 2016 15:47:08 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Jan 2016 15:47:08 -0000 X-IronPort-AV: E=Sophos;i="5.20,533,1444694400"; d="scan'208";a="329618271" From: Ian Jackson MIME-Version: 1.0 Message-ID: <22158.34935.309421.54777@mariner.uk.xensource.com> Date: Thu, 7 Jan 2016 15:47:03 +0000 To: Ian Campbell In-Reply-To: <1452181320.21055.253.camel@citrix.com> References: <1452083701.21055.43.camel@citrix.com> <1452090477.21055.48.camel@citrix.com> <1452094110.21055.81.camel@citrix.com> <568D4CF302000078000C413E@prv-mh.provo.novell.com> <22157.16570.529170.710200@mariner.uk.xensource.com> <1452100101.21055.123.camel@citrix.com> <22157.19333.768520.671818@mariner.uk.xensource.com> <22158.34297.854903.908862@mariner.uk.xensource.com> <1452181320.21055.253.camel@citrix.com> X-Mailer: VM 8.1.0 under 23.4.1 (i486-pc-linux-gnu) X-DLP: MIA2 Cc: xen-devel , Wei Liu , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] OVMF related osstest failures on multiple branches 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 Ian Campbell writes ("Re: [Xen-devel] OVMF related osstest failures on multiple branches"): > On Thu, 2016-01-07 at 15:36 +0000, Ian Jackson wrote: > >  endif > > -OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd > > +OVMF_UPSTREAM_REVISION ?= af9785a9ed61daea52b47f0bf448f1f228beee1e > > This should be: >  OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d > > You've picked up 04c5efb0a141 but not f046e501bbc I think, we should take > both, since that's what I've tested if nothing else. Oops. I had pushed only to 4.6, to which I have followed up with: From 1d3cc6e62c4d2fc3dd9251d4921881425c9d27bd Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Thu, 12 Nov 2015 10:06:58 +0000 Subject: [PATCH] Config.mk: update OVMF changeset The new osstest tested head contains a fix for gcc-4.4 toolchain. Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit f046e501bbca1c8a46853b2e1f1b587e228c73de) This should have been folded into the previous commit. Conflicts: Config.mk Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index e829f7e..1eb53d7 100644 --- a/Config.mk +++ b/Config.mk @@ -253,7 +253,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -OVMF_UPSTREAM_REVISION ?= af9785a9ed61daea52b47f0bf448f1f228beee1e +OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0 MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.0 # Fri Jun 26 11:58:40 2015 +0100