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.93; helo=mga11.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 2ECCF2097E27C for ; Thu, 12 Jul 2018 21:54:13 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jul 2018 21:54:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,346,1526367600"; d="scan'208";a="54035317" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga007.fm.intel.com with ESMTP; 12 Jul 2018 21:53:57 -0700 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 12 Jul 2018 21:53:57 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 12 Jul 2018 21:53:57 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.81]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.173]) with mapi id 14.03.0319.002; Fri, 13 Jul 2018 12:53:55 +0800 From: "Gao, Liming" To: "Bi, Dandan" , "edk2-devel@lists.01.org" CC: "Zeng, Star" Thread-Topic: [patch] MdeModulePkg/PerformanceMeasurement.h: Correct the license Thread-Index: AQHUGenl1mt0Y4ecjUGPdVCEuay5Q6SMlxVg Date: Fri, 13 Jul 2018 04:53:54 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E2BB0DA@SHSMSX104.ccr.corp.intel.com> References: <20180712140810.4644-1-dandan.bi@intel.com> In-Reply-To: <20180712140810.4644-1-dandan.bi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch] MdeModulePkg/PerformanceMeasurement.h: Correct the license X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2018 04:54:13 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Bi, Dandan >Sent: Thursday, July 12, 2018 10:08 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming ; Zeng, Star >Subject: [patch] MdeModulePkg/PerformanceMeasurement.h: Correct the >license > >Corrected to use the BSD license. > >Cc: Liming Gao >Cc: Star Zeng >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Dandan Bi >--- > MdeModulePkg/Include/Guid/PerformanceMeasurement.h | 31 +++++++--- >------------ > 1 file changed, 9 insertions(+), 22 deletions(-) > >diff --git a/MdeModulePkg/Include/Guid/PerformanceMeasurement.h >b/MdeModulePkg/Include/Guid/PerformanceMeasurement.h >index f2955c7..0c3eb59 100644 >--- a/MdeModulePkg/Include/Guid/PerformanceMeasurement.h >+++ b/MdeModulePkg/Include/Guid/PerformanceMeasurement.h >@@ -1,31 +1,18 @@ > /** @file > >-Copyright (c) 2017, Microsoft Corporation >-Copyright (c) 2018, Intel Corporation. All rights reserved.
>+Performance measurement protocol, allows logging performance data. > >-All rights reserved. >-Redistribution and use in source and binary forms, with or without >-modification, are permitted provided that the following conditions are me= t: >-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 noti= ce, >-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. >+Copyright (c) 2017, Microsoft Corporation
>+Copyright (c) 2018, Intel Corporation. All rights reserved.
>+This program and the accompanying materials are licensed and made >available under >+the terms and conditions of the BSD License that accompanies this >distribution. >+The full text of the license may be found at >+http://opensource.org/licenses/bsd-license.php. > >-Performance measurement protocol, allows logging performance data. >+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. > > **/ > > #ifndef _PERFORMANCE_MEASUREMENT_H_ > #define _PERFORMANCE_MEASUREMENT_H_ >-- >1.9.5.msysgit.1