[patch] MdeModulePkg/PerformanceMeasurement.h: Correct the license

[patch] MdeModulePkg/PerformanceMeasurement.h: Correct the license

[Dandan Bi]

Corrected to use the BSD license.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 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.<BR>
+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 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.
+Copyright (c) 2017, Microsoft Corporation<BR>
+Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
+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

Re: [patch] MdeModulePkg/PerformanceMeasurement.h: Correct the license

[Ard Biesheuvel]

On 12 July 2018 at 16:08, Dandan Bi <dandan.bi@intel.com> wrote:
> Corrected to use the BSD license.
>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>

This needs a Reviewed-by from someone at Microsoft.

> ---
>  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.<BR>
> +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 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.
> +Copyright (c) 2017, Microsoft Corporation<BR>
> +Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> +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
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [patch] MdeModulePkg/PerformanceMeasurement.h: Correct the license

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Bi, Dandan
>Sent: Thursday, July 12, 2018 10:08 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>; Zeng, Star <star.zeng@intel.com>
>Subject: [patch] MdeModulePkg/PerformanceMeasurement.h: Correct the
>license
>
>Corrected to use the BSD license.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Star Zeng <star.zeng@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Dandan Bi <dandan.bi@intel.com>
>---
> 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.<BR>
>+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 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.
>+Copyright (c) 2017, Microsoft Corporation<BR>
>+Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
>+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