From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 49D2F211D675B for ; Mon, 11 Mar 2019 08:54:21 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Mar 2019 08:54:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,468,1544515200"; d="scan'208";a="281660248" Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by orsmga004.jf.intel.com with ESMTP; 11 Mar 2019 08:54:20 -0700 Received: from orsmsx157.amr.corp.intel.com (10.22.240.23) by ORSMSX101.amr.corp.intel.com (10.22.225.128) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 11 Mar 2019 08:54:20 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.249]) by ORSMSX157.amr.corp.intel.com ([169.254.9.126]) with mapi id 14.03.0415.000; Mon, 11 Mar 2019 08:54:19 -0700 From: "Kinney, Michael D" To: "Bi, Dandan" , "edk2-devel@lists.01.org" , "Kinney, Michael D" CC: "Gao, Liming" , "Zhang, Chao B" Thread-Topic: [edk2] [patch 1/2] SecurityPkg: Remove duplicated BSD license Thread-Index: AQHU19MtrTvhAMZ/Mk+4DLnRl0mNWKYGlNSQ Date: Mon, 11 Mar 2019 15:54:19 +0000 Message-ID: References: <20190311062324.63096-1-dandan.bi@intel.com> <20190311062324.63096-2-dandan.bi@intel.com> In-Reply-To: <20190311062324.63096-2-dandan.bi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Subject: Re: [patch 1/2] SecurityPkg: Remove duplicated BSD license X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2019 15:54:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Dandan, The copyright line should be preserved and put with the other copyright line. Mike > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] > On Behalf Of Dandan Bi > Sent: Sunday, March 10, 2019 11:23 PM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Gao, > Liming ; Zhang, Chao B > > Subject: [edk2] [patch 1/2] SecurityPkg: Remove > duplicated BSD license >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1612 >=20 > Cc: Chao Zhang > Cc: Jian Wang > Cc: Michael D Kinney > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Dandan Bi > --- > .../Ppi/FirmwareVolumeInfoPrehashedFV.h | 26 ----- > -------------- > 1 file changed, 26 deletions(-) >=20 > diff --git > a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > index 23a56715ca..9a02c429ac 100644 > --- > a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > +++ > b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > @@ -8,36 +8,10 @@ which accompanies this distribution. > The full text of the license may be found > http://opensource.org/licenses/bsd-license.php >=20 > THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN > "AS IS" BASIS, > WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, > EITHER EXPRESS OR IMPLIED. >=20 > -**/ > -/** > -PPI to describe all hash digests for a given FV > - > -Copyright (c) 2017, Microsoft Corporation > - > -All rights reserved. > -Redistribution and use in source and binary forms, with > or without > -modification, are permitted provided that the following > conditions are met: > -1. Redistributions of source code must retain the above > copyright notice, > -this list of conditions and the following disclaimer. > -2. Redistributions in binary form must reproduce the > above copyright notice, > -this list of conditions and the following disclaimer in > the documentation > - and/or other materials provided with the distribution. > - > -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > CONTRIBUTORS "AS IS" AND > -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > LIMITED TO, THE IMPLIED > -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE ARE DISCLAIMED. > -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS > BE LIABLE FOR ANY DIRECT, > -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL DAMAGES (INCLUDING, > -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > SERVICES; LOSS OF USE, > -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER > CAUSED AND ON ANY THEORY OF > -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR > TORT (INCLUDING NEGLIGENCE > -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > SOFTWARE, EVEN IF > -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - > **/ >=20 > #ifndef __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ > #define __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ >=20 > -- > 2.18.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel