Sami, Alexei: please jump to the end of this email.
On 04/08/19 22:25, Michael D Kinney wrote:
> EDK II Maintainers and Reviewers,
>
> I have rebased the patch series as of April 8, 2019, and I have
> added the Reviewed-by tags I have received. Please review the
> commit messages in the V3a branch verify that I have not missed
> any reviewers.
I ran a range-diff between master..v3 and master..v3a (with v3a pointing
to commit c7e9f1bac2a2). Results:
(1) All my R-b's have been picked up. That means the following 7
patches:
edk2: Add License-History.txt
edk2: Change License.txt from 2-Clause BSD to BSD+Patent
edk2: Replace BSD License with BSD+Patent License
ArmVirtPkg: Replace BSD License with BSD+Patent License
OvmfPkg: Replace BSD License with BSD+Patent License
OvmfPkg: Change License.txt from 2-Clause BSD to BSD+Patent
edk2: Remove Contributions.txt and update Readme.md
(2) my R-b has not been mistakenly added to any patch I haven't
reviewed, so that's OK too.
(3) I did notice something interesting: the latest rebase of the patch
UefiCpuPkg: Replace BSD License with BSD+Patent License
seems to have introduced a small unexpected change. Let me quote the
range-diff output:
> 40: a67328cbb41d ! 40: 8c92495fcf11 UefiCpuPkg: Replace BSD License with
> BSD+Patent License
> @@ -18,6 +18,8 @@
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com>
> + Reviewed-by: Eric Dong <eric.d...@intel.com>
> + Reviewed-by: Ray Ni <ray...@intel.com>
>
> diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec
> --- a/UefiCpuPkg/UefiCpuPkg.dec
> @@ -1134,7 +1136,7 @@
> @@
> handles cases where local APIC is disabled.
>
> - Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2010 - 2019, 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
> @@ -1210,7 +1212,7 @@
> @@
> Register CPU Features Library to register and manage CPU features.
>
> - Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2017 - 2019, 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
> @@ -1400,7 +1402,7 @@
> @@
> not provided for that register.
>
> - Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2015 - 2019, 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
> @@ -2347,7 +2349,7 @@
> @@
> # Register CPU Features Library DXE instance.
> #
> - # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> + # Copyright (c) 2017 - 2019, 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
> @@ -2366,7 +2368,7 @@
> @@
> # Register CPU Features Library PEI instance.
> #
> - # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> + # Copyright (c) 2017 - 2019, 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
> @@ -2856,7 +2858,7 @@
> @@
> CPU Register Table Library definitions.
>
> - Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2017 - 2019, 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
> @@ -3785,7 +3787,7 @@
> @@
> UEFI Application to display CPUID leaf information.
>
> - Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2016 - 2019, 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
> @@ -4049,7 +4051,7 @@
> --- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
> +++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
> @@
> - Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2017, AMD Inc. All rights reserved.<BR>
>
> - This program and the accompanying materials
> @@ -4068,7 +4070,7 @@
> --- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
> +++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
> @@
> - Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2017, AMD Inc. All rights reserved.<BR>
>
> - This program and the accompanying materials
> @@ -4697,7 +4699,7 @@
> @@
> CPU Register Table Library functions.
>
> - Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2017 - 2019, 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
> @@ -4709,6 +4711,26 @@
>
> **/
>
> +@@
> + //
> + if (Before) {
> + PreviousEntry = GetPreviousNode (FeatureList, FindEntry);
> +- } else {
> ++ } else {
> ++
> + PreviousEntry = GetNextNode (FeatureList, FindEntry);
> + }
> +
> +@@
> + }
> + }
> + }
> +-}
> ++}
> ++
> +
> + /**
> + Checks and adjusts current CPU features per dependency relationship.
>
> diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
> b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
> --- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/X86TimerLib.c
The contextual differences due to the copyright year updates are fine.
However, the v3a version of the patch, namely commit 8c92495fcf11,
silently fixes some whitespace errors too, in file
"UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c",
which were originally introduced in commit b3c71b472dff
("UefiCpuPkg/RegisterCpuFeaturesLib: Add logic to support semaphore
type.", 2018-10-22).
The v3 version of the patch set didn't include that silent whitespace
fix.
I'm not suggesting that the series should be re-spun one more time just
because of this though!
(4) I've test-built OVMF and ArmVirtQemu in my usual build configs, at
c7e9f1bac2a2, and they all build fine.
Back to the email:
On 04/08/19 22:25, Michael D Kinney wrote:
> I have also verified that no files have been
> added/removed since the V3 patch series was posted last week.
>
> https://github.com/mdkinney/edk2/tree/Bug_1373_BsdPatentLicense_V3a
>
> I have updated the status of the patch reviews on the Wiki page:
>
> https://github.com/tianocore/tianocore.github.io/wiki/Change-EDK-II-to-BSD-Patent-License
>
> I am only missing a review for the DynamicTablesPkg. Please let
> Me know if you have can help complete that review.
Adding Sami, Alexei, Leif and Ard, for this paragraph.
Thanks
Laszlo
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38699): https://edk2.groups.io/g/devel/message/38699
Mute This Topic: https://groups.io/mt/30887153/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
