[PATCH edk2/eck2-platforms 0/2] Update email address for Leif Lindholm

[PATCH edk2/eck2-platforms 0/2] Update email address for Leif Lindholm

[Leif Lindholm]

I changed jobs at the turn of the year and now work for NUVIA
(https://nuviainc.com/). My employer would like me to continue working
on TianoCore, so let's just update the address to my current one.

I have Cc:d anyone I share a section in a Maintainers.txt with, but I
don't think I need Reviewed-by:s from everyone - only one of the stewards
for edk2 and I guess Mike for edk2-platforms.

Many thanks to Linaro, who are letting me keep that address through the
transition phase. But that address will become non-functional in a couple
of weeks or so.

Leif Lindholm (2):
  Maintainers.txt: update email address for Leif Lindholm
  Maintainers.txt: update email address for Leif Lindholm

 Maintainers.txt | 14 +++++++-------
 Maintainers.txt | 24 ++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

Cc: Andrew Fish <afish@apple.com>
Cc: Andy Hayes <andy.hayes@displaylink.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Marcin Wojtas <mw@semihalf.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Pete Batard <pete@akeo.ie>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>

-- 
2.20.1

[PATCH 1/2] Maintainers.txt: update email address for Leif Lindholm

[Leif Lindholm]

Leif now works at NUVIA Inc, update email address accordingly.

Cc: Andrew Fish <afish@apple.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Maintainers.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index 146d8aca93f0..ca9da2892534 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -70,7 +70,7 @@ Tianocore Stewards
 F: *
 M: Andrew Fish <afish@apple.com>
 M: Laszlo Ersek <lersek@redhat.com>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Michael D Kinney <michael.d.kinney@intel.com>
 
 Responsible Disclosure, Reporting Security Issues
@@ -87,7 +87,7 @@ UEFI Shell Binaries (ShellBinPkg.zip) from EDK II Releases:
 W: https://github.com/tianocore/edk2/releases/
 M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)
 M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)
-M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
+M: Leif Lindholm <leif@nuviainc.com>          (ARM/AArch64)
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
 
 EDK II Architectures:
@@ -95,7 +95,7 @@ EDK II Architectures:
 ARM, AARCH64
 F: */AArch64/
 F: */Arm/
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 EDK II Continuous Integration:
@@ -126,13 +126,13 @@ EDK II Packages:
 ArmPkg
 F: ArmPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 ArmPlatformPkg
 F: ArmPlatformPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 ArmVirtPkg
@@ -140,7 +140,7 @@ F: ArmVirtPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
 M: Laszlo Ersek <lersek@redhat.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-R: Leif Lindholm <leif.lindholm@linaro.org>
+R: Leif Lindholm <leif@nuviainc.com>
 
 ArmVirtPkg: modules used on Xen
 F: ArmVirtPkg/ArmVirtXen.*
@@ -173,7 +173,7 @@ M: Alexei Fedorov <Alexei.Fedorov@arm.com>
 EmbeddedPkg
 F: EmbeddedPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 EmulatorPkg
-- 
2.20.1

[PATCH edk2-platforms 2/2] Maintainers.txt: update email address for Leif Lindholm

[Leif Lindholm]

Leif now works at NUVIA Inc, update email address accordingly.

Cc: Andy Hayes <andy.hayes@displaylink.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Marcin Wojtas <mw@semihalf.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Pete Batard <pete@akeo.ie>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Maintainers.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index dfecd3021441..8211d5a632a7 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -68,7 +68,7 @@ F: */
 EDK II Platforms maintainers
 ----------------------------
 F: *
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Michael D Kinney <michael.d.kinney@intel.com>
 
 Responsible Disclosure, Reporting Security Issues
@@ -81,7 +81,7 @@ EDK II Platforms Packages:
 96Boards
 F: Platform/96Boards/
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 
 AMD Seattle
 F: Platform/AMD/OverdriveBoard/
@@ -89,23 +89,23 @@ F: Platform/LeMaker/CelloBoard/
 F: Platform/SoftIron/
 F: Silicon/AMD/Styx/
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 
 ARM
 F: Platform/ARM/
 R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 
 BeagleBoard:
 F: Platform/BeagleBoard/
 F: Silicon/TexasInstruments/
 R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 
 Comcast
 F: Platform/Comcast/
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 
 OptionRomPkg
 F: Drivers/OptionRomPkg/
@@ -114,14 +114,14 @@ M: Ray Ni <ray.ni@intel.com>
 
 DisplayLink
 F: Drivers/DisplayLink/
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 R: Andy Hayes <andy.hayes@displaylink.com>
 
 HiSilicon
 F: Platform/Hisilicon/
 F: Silicon/Hisilicon/
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 Features/Intel
@@ -232,7 +232,7 @@ F: Platform/Marvell/
 F: Platform/SolidRun/Armada80x0McBin/
 F: Silicon/Marvell/
 R: Marcin Wojtas <mw@semihalf.com>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 
 Miscellaneous drivers
 F: Silicon/Atmel/
@@ -240,17 +240,17 @@ F: Silicon/NXP/
 F: Silicon/Openmoko/
 F: Silicon/Synopsys/DesignWare/
 R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 
 Raspberry Pi platforms and silicon
 F: Platform/RaspberryPi/
 F: Silicon/Broadcom/
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
 R: Pete Batard <pete@akeo.ie>
 
 Socionext platforms and silicon
 F: Platform/Socionext/
 F: Silicon/Socionext/
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Leif Lindholm <leif@nuviainc.com>
-- 
2.20.1

Re: [PATCH edk2/eck2-platforms 0/2] Update email address for Leif Lindholm

[Ard Biesheuvel]

On Tue, 14 Jan 2020 at 17:32, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> I changed jobs at the turn of the year and now work for NUVIA
> (https://nuviainc.com/). My employer would like me to continue working
> on TianoCore, so let's just update the address to my current one.
>
> I have Cc:d anyone I share a section in a Maintainers.txt with, but I
> don't think I need Reviewed-by:s from everyone - only one of the stewards
> for edk2 and I guess Mike for edk2-platforms.
>
> Many thanks to Linaro, who are letting me keep that address through the
> transition phase. But that address will become non-functional in a couple
> of weeks or so.
>
> Leif Lindholm (2):
>   Maintainers.txt: update email address for Leif Lindholm
>   Maintainers.txt: update email address for Leif Lindholm
>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>  Maintainers.txt | 14 +++++++-------
>  Maintainers.txt | 24 ++++-----
>  2 files changed, 19 insertions(+), 19 deletions(-)
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Andy Hayes <andy.hayes@displaylink.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Marcin Wojtas <mw@semihalf.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Pete Batard <pete@akeo.ie>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
>
> --
> 2.20.1
>

Re: [PATCH edk2/eck2-platforms 0/2] Update email address for Leif Lindholm

[Leif Lindholm]

On Tue, Jan 14, 2020 at 16:32:53 +0000, Leif Lindholm wrote:
> I changed jobs at the turn of the year and now work for NUVIA
> (https://nuviainc.com/). My employer would like me to continue working
> on TianoCore, so let's just update the address to my current one.
> 
> I have Cc:d anyone I share a section in a Maintainers.txt with, but I
> don't think I need Reviewed-by:s from everyone - only one of the stewards
> for edk2 and I guess Mike for edk2-platforms.
> 
> Many thanks to Linaro, who are letting me keep that address through the
> transition phase. But that address will become non-functional in a couple
> of weeks or so.
> 
> Leif Lindholm (2):
>   Maintainers.txt: update email address for Leif Lindholm
>   Maintainers.txt: update email address for Leif Lindholm
> 
>  Maintainers.txt | 14 +++++++-------
>  Maintainers.txt | 24 ++++-----
>  2 files changed, 19 insertions(+), 19 deletions(-)

For the series:
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

> Cc: Andrew Fish <afish@apple.com>
> Cc: Andy Hayes <andy.hayes@displaylink.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Marcin Wojtas <mw@semihalf.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Pete Batard <pete@akeo.ie>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> 
> -- 
> 2.20.1
> 

Re: [edk2-devel] [PATCH edk2/eck2-platforms 0/2] Update email address for Leif Lindholm

[Philippe Mathieu-Daudé]

On 1/14/20 5:37 PM, Ard Biesheuvel wrote:
> On Tue, 14 Jan 2020 at 17:32, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>>
>> I changed jobs at the turn of the year and now work for NUVIA
>> (https://nuviainc.com/). My employer would like me to continue working
>> on TianoCore, so let's just update the address to my current one.
>>
>> I have Cc:d anyone I share a section in a Maintainers.txt with, but I
>> don't think I need Reviewed-by:s from everyone - only one of the stewards
>> for edk2 and I guess Mike for edk2-platforms.
>>
>> Many thanks to Linaro, who are letting me keep that address through the
>> transition phase. But that address will become non-functional in a couple
>> of weeks or so.
>>
>> Leif Lindholm (2):
>>    Maintainers.txt: update email address for Leif Lindholm
>>    Maintainers.txt: update email address for Leif Lindholm
>>
> 
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>

> 
>>   Maintainers.txt | 14 +++++++-------
>>   Maintainers.txt | 24 ++++-----
>>   2 files changed, 19 insertions(+), 19 deletions(-)
>>
>> Cc: Andrew Fish <afish@apple.com>
>> Cc: Andy Hayes <andy.hayes@displaylink.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Laszlo Ersek <lersek@redhat.com>
>> Cc: Leif Lindholm <leif@nuviainc.com>
>> Cc: Marcin Wojtas <mw@semihalf.com>
>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>> Cc: Pete Batard <pete@akeo.ie>
>> Cc: Ray Ni <ray.ni@intel.com>
>> Cc: Zhichao Gao <zhichao.gao@intel.com>
>>
>> --
>> 2.20.1
>>
> 
> 
> 

Re: [PATCH 1/2] Maintainers.txt: update email address for Leif Lindholm

[Laszlo Ersek]

CC Phil

On 01/14/20 17:32, Leif Lindholm wrote:
> Leif now works at NUVIA Inc, update email address accordingly.
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
>  Maintainers.txt | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)

For this patch:

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Phil, would it make sense for us to ask Leif to post an update to
".mailmap"?

For example, what happens if we run "git shortlog" over a period that
contains patches authored by *both* of Leif's email addresses? Would
those entries be merged into a single block? Would such a merging be
desirable (that's for Leif to decide / propose)?

Right now, Leif is not listed in ".mailmap" -- probably because there is
exactly one email address associated with his authorship, all across the
project history. But that's what's changing now, isn't it?

Thanks,
Laszlo



> diff --git a/Maintainers.txt b/Maintainers.txt
> index 146d8aca93f0..ca9da2892534 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -70,7 +70,7 @@ Tianocore Stewards
>  F: *
>  M: Andrew Fish <afish@apple.com>
>  M: Laszlo Ersek <lersek@redhat.com>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  M: Michael D Kinney <michael.d.kinney@intel.com>
>  
>  Responsible Disclosure, Reporting Security Issues
> @@ -87,7 +87,7 @@ UEFI Shell Binaries (ShellBinPkg.zip) from EDK II Releases:
>  W: https://github.com/tianocore/edk2/releases/
>  M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)
>  M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)
> -M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
> +M: Leif Lindholm <leif@nuviainc.com>          (ARM/AArch64)
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
>  
>  EDK II Architectures:
> @@ -95,7 +95,7 @@ EDK II Architectures:
>  ARM, AARCH64
>  F: */AArch64/
>  F: */Arm/
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>  
>  EDK II Continuous Integration:
> @@ -126,13 +126,13 @@ EDK II Packages:
>  ArmPkg
>  F: ArmPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>  
>  ArmPlatformPkg
>  F: ArmPlatformPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>  
>  ArmVirtPkg
> @@ -140,7 +140,7 @@ F: ArmVirtPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
>  M: Laszlo Ersek <lersek@redhat.com>
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -R: Leif Lindholm <leif.lindholm@linaro.org>
> +R: Leif Lindholm <leif@nuviainc.com>
>  
>  ArmVirtPkg: modules used on Xen
>  F: ArmVirtPkg/ArmVirtXen.*
> @@ -173,7 +173,7 @@ M: Alexei Fedorov <Alexei.Fedorov@arm.com>
>  EmbeddedPkg
>  F: EmbeddedPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>  
>  EmulatorPkg
> 

Re: [PATCH 1/2] Maintainers.txt: update email address for Leif Lindholm

[Philippe Mathieu-Daudé]

On 1/14/20 9:27 PM, Laszlo Ersek wrote:
> CC Phil
> 
> On 01/14/20 17:32, Leif Lindholm wrote:
>> Leif now works at NUVIA Inc, update email address accordingly.
>>
>> Cc: Andrew Fish <afish@apple.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Laszlo Ersek <lersek@redhat.com>
>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>> Cc: Ray Ni <ray.ni@intel.com>
>> Cc: Zhichao Gao <zhichao.gao@intel.com>
>> Cc: Leif Lindholm <leif@nuviainc.com>
>> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
>> ---
>>   Maintainers.txt | 14 +++++++-------
>>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> For this patch:
> 
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> 
> Phil, would it make sense for us to ask Leif to post an update to
> ".mailmap"?
> 
> For example, what happens if we run "git shortlog" over a period that
> contains patches authored by *both* of Leif's email addresses? Would
> those entries be merged into a single block? Would such a merging be
> desirable (that's for Leif to decide / propose)?

One use of .mailmap is to clean/unify the NAME part.
In this case Leif isn't affected because his NAME is the same.

The other use is to redirect email when a user switch email. When 
fixing/referring old commit, some email tools might take the old commit 
author/committer. In this case .mailmap helps. I think it is desirable 
in Leif particular case.

If he agrees the maintainer pushing his patch can amend this snippet:

-- >8 --
diff --git a/.mailmap b/.mailmap
index ae179b0886c7..bbf3052aa3aa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,6 +37,7 @@ Jim Dailey <Jim.Dailey@Dell.com>
  Jim Dailey <Jim.Dailey@Dell.com> <Jim_Dailey@Dell.com>
  Laszlo Ersek <lersek@redhat.com> 
<lersek@6f19259b-4bc3-4df7-8a09-765794883524>
  Laszlo Ersek <lersek@redhat.com> <lersek@Edk2>
+Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
  Liming Gao <liming.gao@intel.com> <Gao, Liming liming.gao@intel.com>
  Liming Gao <liming.gao@intel.com> 
<lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
  Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
---

Note he stays close to you and Liming ;)

> 
> Right now, Leif is not listed in ".mailmap" -- probably because there is
> exactly one email address associated with his authorship, all across the
> project history. But that's what's changing now, isn't it?
> 
> Thanks,
> Laszlo
> 
> 
> 
>> diff --git a/Maintainers.txt b/Maintainers.txt
>> index 146d8aca93f0..ca9da2892534 100644
>> --- a/Maintainers.txt
>> +++ b/Maintainers.txt
>> @@ -70,7 +70,7 @@ Tianocore Stewards
>>   F: *
>>   M: Andrew Fish <afish@apple.com>
>>   M: Laszlo Ersek <lersek@redhat.com>
>> -M: Leif Lindholm <leif.lindholm@linaro.org>
>> +M: Leif Lindholm <leif@nuviainc.com>
>>   M: Michael D Kinney <michael.d.kinney@intel.com>
>>   
>>   Responsible Disclosure, Reporting Security Issues
>> @@ -87,7 +87,7 @@ UEFI Shell Binaries (ShellBinPkg.zip) from EDK II Releases:
>>   W: https://github.com/tianocore/edk2/releases/
>>   M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)
>>   M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)
>> -M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
>> +M: Leif Lindholm <leif@nuviainc.com>          (ARM/AArch64)
>>   M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
>>   
>>   EDK II Architectures:
>> @@ -95,7 +95,7 @@ EDK II Architectures:
>>   ARM, AARCH64
>>   F: */AArch64/
>>   F: */Arm/
>> -M: Leif Lindholm <leif.lindholm@linaro.org>
>> +M: Leif Lindholm <leif@nuviainc.com>
>>   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>   
>>   EDK II Continuous Integration:
>> @@ -126,13 +126,13 @@ EDK II Packages:
>>   ArmPkg
>>   F: ArmPkg/
>>   W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
>> -M: Leif Lindholm <leif.lindholm@linaro.org>
>> +M: Leif Lindholm <leif@nuviainc.com>
>>   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>   
>>   ArmPlatformPkg
>>   F: ArmPlatformPkg/
>>   W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
>> -M: Leif Lindholm <leif.lindholm@linaro.org>
>> +M: Leif Lindholm <leif@nuviainc.com>
>>   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>   
>>   ArmVirtPkg
>> @@ -140,7 +140,7 @@ F: ArmVirtPkg/
>>   W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
>>   M: Laszlo Ersek <lersek@redhat.com>
>>   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> -R: Leif Lindholm <leif.lindholm@linaro.org>
>> +R: Leif Lindholm <leif@nuviainc.com>
>>   
>>   ArmVirtPkg: modules used on Xen
>>   F: ArmVirtPkg/ArmVirtXen.*
>> @@ -173,7 +173,7 @@ M: Alexei Fedorov <Alexei.Fedorov@arm.com>
>>   EmbeddedPkg
>>   F: EmbeddedPkg/
>>   W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
>> -M: Leif Lindholm <leif.lindholm@linaro.org>
>> +M: Leif Lindholm <leif@nuviainc.com>
>>   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>   
>>   EmulatorPkg
>>
> 

Re: [PATCH 1/2] Maintainers.txt: update email address for Leif Lindholm

[Leif Lindholm]

On Thu, Jan 16, 2020 at 19:54:43 +0100, Philippe Mathieu-Daudé wrote:
> > Phil, would it make sense for us to ask Leif to post an update to
> > ".mailmap"?
> > 
> > For example, what happens if we run "git shortlog" over a period that
> > contains patches authored by *both* of Leif's email addresses? Would
> > those entries be merged into a single block? Would such a merging be
> > desirable (that's for Leif to decide / propose)?
> 
> One use of .mailmap is to clean/unify the NAME part.
> In this case Leif isn't affected because his NAME is the same.
> 
> The other use is to redirect email when a user switch email. When
> fixing/referring old commit, some email tools might take the old commit
> author/committer. In this case .mailmap helps. I think it is desirable in
> Leif particular case.

The question is *why* we use the mailmap to begin with.
It is not clear to me that there was an understanding at the point
.mailmap was added that the intent was to provide a mapping of people
to current email addresses in perpetuity.

Indeed, the initial commit message says:
"The .mailmap git feature helps fixing commit mistakes (in name/email)."

The comment header in the file itself says:
# This list is used by git-shortlog to fix a few botched name translations
# in the git archive, either because the author's full name was messed up
# and/or not always written the same way, making contributions from the
# same person appearing not to be so or badly displayed.

Now, I'm not saying that providing a way to track individuals across
employments, acquisitions, or other transitions is a bad idea. And
using the .mailmap is a workable way of doing this, since it needs to
be manually invoked outside of shortlog (it could be disastrous if it
didn't, or the default git behaviour changes in the future).

*But* before we start treating it in this way, I would like to see the
intended use of .mailmap documented (in the tree), and that change
reviewed by at least a couple of stewards and enough others to be able
to say we have a consensus.

If we do, I have no objections to the below patch being added at that
point - but from my viewpoint, doing it before then would mean an
unreviewed change to the process as some people understood when the
file was first added.

Best Regards,

Leif

> If he agrees the maintainer pushing his patch can amend this snippet:
> 
> -- >8 --
> diff --git a/.mailmap b/.mailmap
> index ae179b0886c7..bbf3052aa3aa 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -37,6 +37,7 @@ Jim Dailey <Jim.Dailey@Dell.com>
>  Jim Dailey <Jim.Dailey@Dell.com> <Jim_Dailey@Dell.com>
>  Laszlo Ersek <lersek@redhat.com>
> <lersek@6f19259b-4bc3-4df7-8a09-765794883524>
>  Laszlo Ersek <lersek@redhat.com> <lersek@Edk2>
> +Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
>  Liming Gao <liming.gao@intel.com> <Gao, Liming liming.gao@intel.com>
>  Liming Gao <liming.gao@intel.com>
> <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
>  Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
> ---
> 
> Note he stays close to you and Liming ;)
> 
> > 
> > Right now, Leif is not listed in ".mailmap" -- probably because there is
> > exactly one email address associated with his authorship, all across the
> > project history. But that's what's changing now, isn't it?
> > 
> > Thanks,
> > Laszlo
> > 
> > 
> > 
> > > diff --git a/Maintainers.txt b/Maintainers.txt
> > > index 146d8aca93f0..ca9da2892534 100644
> > > --- a/Maintainers.txt
> > > +++ b/Maintainers.txt
> > > @@ -70,7 +70,7 @@ Tianocore Stewards
> > >   F: *
> > >   M: Andrew Fish <afish@apple.com>
> > >   M: Laszlo Ersek <lersek@redhat.com>
> > > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > > +M: Leif Lindholm <leif@nuviainc.com>
> > >   M: Michael D Kinney <michael.d.kinney@intel.com>
> > >   Responsible Disclosure, Reporting Security Issues
> > > @@ -87,7 +87,7 @@ UEFI Shell Binaries (ShellBinPkg.zip) from EDK II Releases:
> > >   W: https://github.com/tianocore/edk2/releases/
> > >   M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)
> > >   M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)
> > > -M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
> > > +M: Leif Lindholm <leif@nuviainc.com>          (ARM/AArch64)
> > >   M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
> > >   EDK II Architectures:
> > > @@ -95,7 +95,7 @@ EDK II Architectures:
> > >   ARM, AARCH64
> > >   F: */AArch64/
> > >   F: */Arm/
> > > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > > +M: Leif Lindholm <leif@nuviainc.com>
> > >   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > >   EDK II Continuous Integration:
> > > @@ -126,13 +126,13 @@ EDK II Packages:
> > >   ArmPkg
> > >   F: ArmPkg/
> > >   W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
> > > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > > +M: Leif Lindholm <leif@nuviainc.com>
> > >   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > >   ArmPlatformPkg
> > >   F: ArmPlatformPkg/
> > >   W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
> > > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > > +M: Leif Lindholm <leif@nuviainc.com>
> > >   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > >   ArmVirtPkg
> > > @@ -140,7 +140,7 @@ F: ArmVirtPkg/
> > >   W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
> > >   M: Laszlo Ersek <lersek@redhat.com>
> > >   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > -R: Leif Lindholm <leif.lindholm@linaro.org>
> > > +R: Leif Lindholm <leif@nuviainc.com>
> > >   ArmVirtPkg: modules used on Xen
> > >   F: ArmVirtPkg/ArmVirtXen.*
> > > @@ -173,7 +173,7 @@ M: Alexei Fedorov <Alexei.Fedorov@arm.com>
> > >   EmbeddedPkg
> > >   F: EmbeddedPkg/
> > >   W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
> > > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > > +M: Leif Lindholm <leif@nuviainc.com>
> > >   M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > >   EmulatorPkg
> > > 
> > 
> 

Re: [PATCH edk2-platforms 2/2] Maintainers.txt: update email address for Leif Lindholm

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

> -----Original Message-----
> From: Leif Lindholm <leif.lindholm@linaro.org>
> Sent: Tuesday, January 14, 2020 8:33 AM
> To: devel@edk2.groups.io
> Cc: Andy Hayes <andy.hayes@displaylink.com>; Ard
> Biesheuvel <ard.biesheuvel@linaro.org>; Marcin Wojtas
> <mw@semihalf.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Pete Batard
> <pete@akeo.ie>; Leif Lindholm <leif@nuviainc.com>
> Subject: [PATCH edk2-platforms 2/2] Maintainers.txt:
> update email address for Leif Lindholm
> 
> Leif now works at NUVIA Inc, update email address
> accordingly.
> 
> Cc: Andy Hayes <andy.hayes@displaylink.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Marcin Wojtas <mw@semihalf.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Pete Batard <pete@akeo.ie>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
>  Maintainers.txt | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index dfecd3021441..8211d5a632a7 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -68,7 +68,7 @@ F: */
>  EDK II Platforms maintainers
>  ----------------------------
>  F: *
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  M: Michael D Kinney <michael.d.kinney@intel.com>
> 
>  Responsible Disclosure, Reporting Security Issues
> @@ -81,7 +81,7 @@ EDK II Platforms Packages:
>  96Boards
>  F: Platform/96Boards/
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> 
>  AMD Seattle
>  F: Platform/AMD/OverdriveBoard/
> @@ -89,23 +89,23 @@ F: Platform/LeMaker/CelloBoard/
>  F: Platform/SoftIron/
>  F: Silicon/AMD/Styx/
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> 
>  ARM
>  F: Platform/ARM/
>  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> 
>  BeagleBoard:
>  F: Platform/BeagleBoard/
>  F: Silicon/TexasInstruments/
>  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> 
>  Comcast
>  F: Platform/Comcast/
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> 
>  OptionRomPkg
>  F: Drivers/OptionRomPkg/
> @@ -114,14 +114,14 @@ M: Ray Ni <ray.ni@intel.com>
> 
>  DisplayLink
>  F: Drivers/DisplayLink/
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>  R: Andy Hayes <andy.hayes@displaylink.com>
> 
>  HiSilicon
>  F: Platform/Hisilicon/
>  F: Silicon/Hisilicon/
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
>  Features/Intel
> @@ -232,7 +232,7 @@ F: Platform/Marvell/
>  F: Platform/SolidRun/Armada80x0McBin/
>  F: Silicon/Marvell/
>  R: Marcin Wojtas <mw@semihalf.com>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> 
>  Miscellaneous drivers
>  F: Silicon/Atmel/
> @@ -240,17 +240,17 @@ F: Silicon/NXP/
>  F: Silicon/Openmoko/
>  F: Silicon/Synopsys/DesignWare/
>  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> 
>  Raspberry Pi platforms and silicon
>  F: Platform/RaspberryPi/
>  F: Silicon/Broadcom/
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
>  R: Pete Batard <pete@akeo.ie>
> 
>  Socionext platforms and silicon
>  F: Platform/Socionext/
>  F: Silicon/Socionext/
>  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> -M: Leif Lindholm <leif.lindholm@linaro.org>
> +M: Leif Lindholm <leif@nuviainc.com>
> --
> 2.20.1

Re: [PATCH 1/2] Maintainers.txt: update email address for Leif Lindholm

[Laszlo Ersek]

On 01/16/20 22:34, Leif Lindholm wrote:
> On Thu, Jan 16, 2020 at 19:54:43 +0100, Philippe Mathieu-Daudé wrote:
>>> Phil, would it make sense for us to ask Leif to post an update to
>>> ".mailmap"?
>>>
>>> For example, what happens if we run "git shortlog" over a period that
>>> contains patches authored by *both* of Leif's email addresses? Would
>>> those entries be merged into a single block? Would such a merging be
>>> desirable (that's for Leif to decide / propose)?
>>
>> One use of .mailmap is to clean/unify the NAME part.
>> In this case Leif isn't affected because his NAME is the same.
>>
>> The other use is to redirect email when a user switch email. When
>> fixing/referring old commit, some email tools might take the old commit
>> author/committer. In this case .mailmap helps. I think it is desirable in
>> Leif particular case.
> 
> The question is *why* we use the mailmap to begin with.
> It is not clear to me that there was an understanding at the point
> .mailmap was added that the intent was to provide a mapping of people
> to current email addresses in perpetuity.

It's one of the possible / nice-to-have goals, for "git shortlog".

It's absolutely *not* a requirement -- and I wanted to mention again
that such a cross-domain mapping is not something a maintainer can heap
on top at a push. Cross-domain generally implies cross-employer, and
companies might easily not be OK with that. So it's fully up to the
person to propose (post) such a mapping. If they don't, then there's not
going to be such a mapping; end of story :)

> Indeed, the initial commit message says:
> "The .mailmap git feature helps fixing commit mistakes (in name/email)."
> 
> The comment header in the file itself says:
> # This list is used by git-shortlog to fix a few botched name translations
> # in the git archive, either because the author's full name was messed up
> # and/or not always written the same way, making contributions from the
> # same person appearing not to be so or badly displayed.
> 
> Now, I'm not saying that providing a way to track individuals across
> employments, acquisitions, or other transitions is a bad idea. And
> using the .mailmap is a workable way of doing this, since it needs to
> be manually invoked outside of shortlog (it could be disastrous if it
> didn't, or the default git behaviour changes in the future).

I agree: ".mailmap" must not unsolicitedly collapse email addresses.

> *But* before we start treating it in this way, I would like to see the
> intended use of .mailmap documented (in the tree), and that change
> reviewed by at least a couple of stewards and enough others to be able
> to say we have a consensus.
> 
> If we do, I have no objections to the below patch being added at that
> point - but from my viewpoint, doing it before then would mean an
> unreviewed change to the process as some people understood when the
> file was first added.

I don't think we're actively proposing cross-domain mappings, as part of
the process. In my mind it's something everyone is "free to consider". I
just thought you might want to consider it.

I'm also not against formalizing this option, but I don't feel like
actively pursuing it.

Thanks!
Laszlo

Re: [PATCH edk2-platforms 2/2] Maintainers.txt: update email address for Leif Lindholm

[Leif Lindholm]

On Fri, Jan 17, 2020 at 05:42:35 +0000, Kinney, Michael D wrote:
> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

Thanks!

Pushed as 19c82dcb8d49.

Expect this address to go permanently offline within the next week or
so.

/
    Leif

> > -----Original Message-----
> > From: Leif Lindholm <leif.lindholm@linaro.org>
> > Sent: Tuesday, January 14, 2020 8:33 AM
> > To: devel@edk2.groups.io
> > Cc: Andy Hayes <andy.hayes@displaylink.com>; Ard
> > Biesheuvel <ard.biesheuvel@linaro.org>; Marcin Wojtas
> > <mw@semihalf.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>; Pete Batard
> > <pete@akeo.ie>; Leif Lindholm <leif@nuviainc.com>
> > Subject: [PATCH edk2-platforms 2/2] Maintainers.txt:
> > update email address for Leif Lindholm
> > 
> > Leif now works at NUVIA Inc, update email address
> > accordingly.
> > 
> > Cc: Andy Hayes <andy.hayes@displaylink.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Marcin Wojtas <mw@semihalf.com>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Cc: Pete Batard <pete@akeo.ie>
> > Cc: Leif Lindholm <leif@nuviainc.com>
> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> > ---
> >  Maintainers.txt | 24 ++++++++++++------------
> >  1 file changed, 12 insertions(+), 12 deletions(-)
> > 
> > diff --git a/Maintainers.txt b/Maintainers.txt
> > index dfecd3021441..8211d5a632a7 100644
> > --- a/Maintainers.txt
> > +++ b/Maintainers.txt
> > @@ -68,7 +68,7 @@ F: */
> >  EDK II Platforms maintainers
> >  ----------------------------
> >  F: *
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> >  M: Michael D Kinney <michael.d.kinney@intel.com>
> > 
> >  Responsible Disclosure, Reporting Security Issues
> > @@ -81,7 +81,7 @@ EDK II Platforms Packages:
> >  96Boards
> >  F: Platform/96Boards/
> >  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > 
> >  AMD Seattle
> >  F: Platform/AMD/OverdriveBoard/
> > @@ -89,23 +89,23 @@ F: Platform/LeMaker/CelloBoard/
> >  F: Platform/SoftIron/
> >  F: Silicon/AMD/Styx/
> >  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > 
> >  ARM
> >  F: Platform/ARM/
> >  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > 
> >  BeagleBoard:
> >  F: Platform/BeagleBoard/
> >  F: Silicon/TexasInstruments/
> >  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > 
> >  Comcast
> >  F: Platform/Comcast/
> >  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > 
> >  OptionRomPkg
> >  F: Drivers/OptionRomPkg/
> > @@ -114,14 +114,14 @@ M: Ray Ni <ray.ni@intel.com>
> > 
> >  DisplayLink
> >  F: Drivers/DisplayLink/
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> >  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >  R: Andy Hayes <andy.hayes@displaylink.com>
> > 
> >  HiSilicon
> >  F: Platform/Hisilicon/
> >  F: Silicon/Hisilicon/
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> >  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > 
> >  Features/Intel
> > @@ -232,7 +232,7 @@ F: Platform/Marvell/
> >  F: Platform/SolidRun/Armada80x0McBin/
> >  F: Silicon/Marvell/
> >  R: Marcin Wojtas <mw@semihalf.com>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > 
> >  Miscellaneous drivers
> >  F: Silicon/Atmel/
> > @@ -240,17 +240,17 @@ F: Silicon/NXP/
> >  F: Silicon/Openmoko/
> >  F: Silicon/Synopsys/DesignWare/
> >  R: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > 
> >  Raspberry Pi platforms and silicon
> >  F: Platform/RaspberryPi/
> >  F: Silicon/Broadcom/
> >  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> >  R: Pete Batard <pete@akeo.ie>
> > 
> >  Socionext platforms and silicon
> >  F: Platform/Socionext/
> >  F: Silicon/Socionext/
> >  M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > -M: Leif Lindholm <leif.lindholm@linaro.org>
> > +M: Leif Lindholm <leif@nuviainc.com>
> > --
> > 2.20.1
>