From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=lk/Sq4La; spf=pass (domain: linaro.org, ip: 209.85.128.68, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by groups.io with SMTP; Mon, 03 Jun 2019 03:11:28 -0700 Received: by mail-wm1-f68.google.com with SMTP id d17so2801139wmb.3 for ; Mon, 03 Jun 2019 03:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=h83nehCv2ScyThqF0lHZHKMXo4a1/VOfS39OwZIruWA=; b=lk/Sq4LaFDt1FaPaTDuYJxUeH+aGzUMpb4yEvHCm7QZ4aEuW3tz/V1IWrwBsCyLpa1 Rdv4qVNMfxsi9uS74fvgmvTh802JrNL4SfjJa45fhGizDlETWFBO5OnbNR+RDtwbIxdN oI2B8fagSf4NAKjKFN9HLMbtelfMJ7vBJf3kzPk5duoGCqfSmitERDGIDfGf0zlsmJ7g MXsdUZeO6dUy93gX6fQojkyTNtHa/qbrwVwuIRTNoC7wfaF8ypUIonxa9E6oTaybsCa7 usXMRe+2ycf+wxkYWnZ+rUG5Kaa8jbAll70VK9aJzYs8V3zWN03NZoHPi1DK2ixSrSeL o2Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=h83nehCv2ScyThqF0lHZHKMXo4a1/VOfS39OwZIruWA=; b=hj0T9qPWd5CwpjdjOudVo8dJZaRHrojChGys4a4AMJU4NiPugU7Tmi7mT4+fRLnLBr G8KSGIITP2DhhpXUGwOiiOMzhUSFxj+cC7gNDJjite4bmSHE//BP5RrJNriDVw6Bbsjq E7juWfZQ6h3VVj60Rb6YDEJLZlYeN8vy8C9G+xyhOLKV7/lFgI0w10u5VjtNEqRqTs3c RM5zkDJ6sAi0TiCYRkZivl73fUJjnnTJ05nQlJFazpin0OBvBl3kDe4ftgPD7w0XPhmv hzMh3Wq46N6KVPWUF2+o6ck/gDFBBism95qlclsNtOz02okd/zBibumJFqQJXfa4aqf7 u4Ug== X-Gm-Message-State: APjAAAXSPRi8kZ29CI+ki2TxBWHBqzSkcA5O6HJgBf8+l+Q4nOMJknw3 rn25yphhYVvhmVs0+rfla7Un7ghGgzM= X-Google-Smtp-Source: APXvYqxbG3L4vGeuIvrFvB8QyD8dLMkGmx7QfZP1vMBYhJTEEOm9sX9cHd8P96cyOFujjOTdgLagCg== X-Received: by 2002:a05:600c:ca:: with SMTP id u10mr13263502wmm.33.1559556686900; Mon, 03 Jun 2019 03:11:26 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id b5sm4257551wru.69.2019.06.03.03.11.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 03:11:25 -0700 (PDT) Date: Mon, 3 Jun 2019 11:11:24 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, zhichao.gao@intel.com Cc: Bret Barkelew , "Wang, Jian J" , "Wu, Hao A" , "Ni, Ray" , "Zeng, Star" , "Gao, Liming" , Sean Brogan , Michael Turner Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/CapsulePei: Optimize the CapsulePei Message-ID: <20190603101124.yunclyvck7igw4gy@bivouac.eciton.net> References: <20190529004555.45364-1-zhichao.gao@intel.com> <20190529111143.whfxiphgc3y6jap4@bivouac.eciton.net> <3CE959C139B4C44DBEA1810E3AA6F9000B7DB95D@SHSMSX101.ccr.corp.intel.com> <20190529150910.bxrhcbu4j7pezuc2@bivouac.eciton.net> <3CE959C139B4C44DBEA1810E3AA6F9000B7E1D64@SHSMSX101.ccr.corp.intel.com> <20190531164339.bytd5w5sfiub75ic@bivouac.eciton.net> <3CE959C139B4C44DBEA1810E3AA6F9000B7E329A@SHSMSX101.ccr.corp.intel.com> MIME-Version: 1.0 In-Reply-To: <3CE959C139B4C44DBEA1810E3AA6F9000B7E329A@SHSMSX101.ccr.corp.intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jun 03, 2019 at 08:18:03AM +0000, Gao, Zhichao wrote: > > > > -----Original Message----- > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > > Leif Lindholm > > Sent: Saturday, June 1, 2019 12:44 AM > > To: devel@edk2.groups.io; Gao, Zhichao > > Cc: Bret Barkelew ; Wang, Jian J > > ; Wu, Hao A ; Ni, Ray > > ; Zeng, Star ; Gao, Liming > > ; Sean Brogan ; > > Michael Turner > > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/CapsulePei: Optimize the > > CapsulePei > > > > On Fri, May 31, 2019 at 01:46:14AM +0000, Gao, Zhichao wrote: > > > > So what modifications were made to the code on the way from the > > > > project Mu repository? That would be useful to mention in the commit > > message. > > > > > > I would add this info blow commit message(not in commit message). It > > > is helpful for review. But it may not be useful to add them in the > > > commit message. > > > On my opinion, the commit message should contain the summary and > > impact of the changes. > > > > You are importing a file from a different repository, produced by a different > > company. As part of that import, you are claiming Intel copyright for 2019 for > > the code provided in the patch. > > > > This means that you are making a legal claim to the intellectual property > > provided by the patch on behalf of Intel. > > Either: > > - you have modified the code compared to the original, at which > > point the commit mesage *must* reflect this - it is no longer the > > contribution that the original message describes. > > For an example, see how Laszlo reflected his changes to 94e0dd1afe53. > > Sorry. I can't understand the example. But maybe I got your point. I > would update the commit message with the MU link and mention what > changes I made. Then I would update the copyright of Intel. Is that > the correct flow? Yes, this is correct. Me, Ard and Laszlo tend to follow the format set out in https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v5.2-rc3#n468 but there is no official form for this in edk2. The importance is that the information is kept in the commit message, though. > By the way, I have done that in V2 but the link and change info > didn't include to the commit message. I would put them into the > commit message in next patch. Excellent, thank you. Best Regards, Leif > Thanks, > Zhichao > > > - the Intel copyright addition is a mistake (and must be dropped). > > > > Regards, > > > > Leif > > > > > > > > Thanks, > > > Zhichao > > > > > > > > > > > Regards, > > > > > > > > Leif > > > > > > > > > And I also make some minor changes on it. > > > > > > > > > > Thanks, > > > > > Zhichao > > > > > > > > > > > -----Original Message----- > > > > > > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > > > > > > Sent: Wednesday, May 29, 2019 7:12 PM > > > > > > To: devel@edk2.groups.io; Gao, Zhichao > > > > > > Cc: Bret Barkelew ; Wang, Jian J > > > > > > ; Wu, Hao A ; Ni, Ray > > > > > > ; Zeng, Star ; Gao, > > > > > > Liming ; Sean Brogan > > > > > > ; Michael Turner > > > > > > > > > > > > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/CapsulePei: > > > > > > Optimize the CapsulePei > > > > > > > > > > > > On Wed, May 29, 2019 at 08:45:55AM +0800, Gao, Zhichao wrote: > > > > > > > From: Bret Barkelew > > > > > > > > > > > > If this code is from Microsoft... > > > > > > > > > > > > > > > > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1853 > > > > > > > > > > > > > > Sperate the capsule check function from GetCapsuleDescriptors > > > > > > > and name it to AreCapsulesStaged. > > > > > > > Rename GetCapsuleDescriptors to GetScatterGatherHeadEntries. > > > > > > > And optimize its to remove the duplicated code. > > > > > > > > > > > > > > Cc: Jian J Wang > > > > > > > Cc: Hao A Wu > > > > > > > Cc: Ray Ni > > > > > > > Cc: Star Zeng > > > > > > > Cc: Liming Gao > > > > > > > Cc: Sean Brogan > > > > > > > Cc: Michael Turner > > > > > > > Cc: Bret Barkelew > > > > > > > Signed-off-by: Zhichao gao > > > > > > > --- > > > > > > > MdeModulePkg/Universal/CapsulePei/Capsule.h | 3 +- > > > > > > > .../Universal/CapsulePei/CapsulePei.inf | 3 +- > > > > > > > .../Universal/CapsulePei/UefiCapsule.c | 357 ++++++++++------- > > - > > > > > > > 3 files changed, 194 insertions(+), 169 deletions(-) > > > > > > > > > > > > > > diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h > > > > > > > b/MdeModulePkg/Universal/CapsulePei/Capsule.h > > > > > > > index baf40423af..fc20dd8b92 100644 > > > > > > > --- a/MdeModulePkg/Universal/CapsulePei/Capsule.h > > > > > > > +++ b/MdeModulePkg/Universal/CapsulePei/Capsule.h > > > > > > > @@ -1,6 +1,6 @@ > > > > > > > /** @file > > > > > > > > > > > > > > -Copyright (c) 2006 - 2018, Intel Corporation. All rights > > > > > > > reserved.
> > > > > > > +Copyright (c) 2006 - 2019, Intel Corporation. All rights > > > > > > > +reserved.
> > > > > > > > > > > > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > > > > > > > > > @@ -30,6 +30,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > > #include #include > > > > > > > #include > > > > > > > > > > > > > > +#include > > > > > > > #include #include > > > > > > > "Common/CommonHeader.h" > > > > > > > > > > > > > > diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf > > > > > > > b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf > > > > > > > index 5d43df3075..9c88b3986f 100644 > > > > > > > --- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf > > > > > > > +++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf > > > > > > > @@ -6,7 +6,7 @@ > > > > > > > # This external input must be validated carefully to avoid > > > > > > > security issue like # buffer overflow, integer overflow. > > > > > > > # > > > > > > > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights > > > > > > > reserved.
> > > > > > > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights > > > > > > > +reserved.
> > > > > > > > > > > > ...why does Intel get the copyright? > > > > > > > > > > > > / > > > > > > Leif > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >