The copyright information was incorrectly updated.
The correct copyright is:
Copyright (c) 2011 - 2015, Intel Corporation. All rights
reserved.<BR>
Previous copyrights must be maintained.
This patch should be rejected and a new one submitted with the corrected
copyright notice and subject line.
Daryl McDaniel
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Ard
Biesheuvel
Sent: Thursday, July 30, 2015 12:27 AM
To: Eric Dong <eric.d...@intel.com>
Cc: Ruiyu Ni <ruiyu...@intel.com>; edk2-devel@lists.01.org; Gao, Liming
<liming....@intel.com>
Subject: Re: [edk2] [Patch 2/2] Update copyright info, use BDS license.
On 29 July 2015 at 10:59, Eric Dong <eric.d...@intel.com> wrote:
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Eric Dong <eric.d...@intel.com>
The license is called 'BSD' not 'BDS'
Could you fix up the commit titles please?
--
Ard.
> ---
> .../Include/Guid/HiiBootMaintenanceFormset.h | 28
++++++++++------------
> 1 file changed, 12 insertions(+), 16 deletions(-)
>
> diff --git a/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h
> b/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h
> index 7c809f4..393cc95 100644
> --- a/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h
> +++ b/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h
> @@ -1,25 +1,21 @@
> //
> -// This file contains 'Framework Code' and is licensed as such -//
> under the terms of your license agreement with Intel or your -//
> vendor. This file may not be modified, except as allowed by -//
> additional terms of your license agreement.
> -//
> -/**@file
> -Constants and declarations that are common accross PEI and DXE.
> -
> -Copyright (c) 2011, Intel Corporation. All rights reserved.<BR> -This
> software and associated documentation (if any) is furnished -under a
> license and may only be used or copied in accordance -with the terms
> of the license. Except as permitted by such -license, no part of this
> software or documentation may be -reproduced, stored in a retrieval
> system, or transmitted in any -form or by any means without the
> express written consent of -Intel Corporation.
> +/** @file
> + Guid definition for Boot Maintainence Formset.
> +
> +Copyright (c) 2015, 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 which
> +accompanies this distribution. The full text of the license may be
> +found at http://opensource.org/licenses/bsd-license.php
> +
> +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 __HII_BOOT_MAINTENANCE_FORMSET_H__
> #define __HII_BOOT_MAINTENANCE_FORMSET_H__
>
> ///
> /// Guid define to group the item show on the Boot Menaintenance Manager
Menu.
> --
> 1.9.5.msysgit.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
