[PATCH] Maintainers: switch to my Arm email address

[PATCH] Maintainers: switch to my Arm email address

[Ard Biesheuvel]

I no longer work for Linaro (and haven't for a while) so in anticipation
of losing access to my @linaro.org mailbox, let's switch to the ARM one
for my Tiancore contributions and maintainerships. Update the .mailmap
at the same time so the tooling can rewrite history where needed.

Cc: Andrew Fish <afish@apple.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
While I'm working out some kinks with the Arm corporate email infrastructure,
I may elect to sit on this patch for a couple of weeks at least, but I'm
sending it out now so everybody is aware.

 .mailmap        |  3 ++-
 Maintainers.txt | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.mailmap b/.mailmap
index ae179b0886c7..d52399b02772 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,7 +13,8 @@
 Aaron Li <aaron.li@intel.com> <songpeng.li@intel.com>
 Antoine Cœur <coeur@gmx.fr>
 Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
-Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
+Ard Biesheuvel <ard.biesheuvel@arm.com> <abiesheuvel@Edk2>
+Ard Biesheuvel <ard.biesheuvel@arm.com> <ard.biesheuvel@linaro.org>
 Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
 Baraneedharan Anbazhagan <anbazhagan@hp.com>
 Chasel Chiu <chasel.chiu@intel.com>
diff --git a/Maintainers.txt b/Maintainers.txt
index 342bb8d0850c..9aa7e164fa87 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -88,7 +88,7 @@ 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@nuviainc.com>          (ARM/AArch64)
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>    (ARM/AArch64)
 
 EDK II Architectures:
 ---------------------
@@ -96,7 +96,7 @@ ARM, AARCH64
 F: */AArch64/
 F: */Arm/
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 
 EDK II Continuous Integration:
 ------------------------------
@@ -127,19 +127,19 @@ ArmPkg
 F: ArmPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 
 ArmPlatformPkg
 F: ArmPlatformPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 
 ArmVirtPkg
 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>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 R: Leif Lindholm <leif@nuviainc.com>
 
 ArmVirtPkg: modules used on Xen
@@ -174,7 +174,7 @@ EmbeddedPkg
 F: EmbeddedPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 
 EmulatorPkg
 F: EmulatorPkg/
@@ -386,7 +386,7 @@ F: OvmfPkg/
 W: http://www.tianocore.org/ovmf/
 M: Jordan Justen <jordan.l.justen@intel.com>
 M: Laszlo Ersek <lersek@redhat.com>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 S: Maintained
 
 OvmfPkg: Xen-related modules
@@ -488,7 +488,7 @@ S: Maintained
 
 StandaloneMmPkg
 F: StandaloneMmPkg/
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 M: Sami Mujawar <sami.mujawar@arm.com>
 M: Jiewen Yao <jiewen.yao@intel.com>
 R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
-- 
2.17.1

Re: [PATCH] Maintainers: switch to my Arm email address

[Leif Lindholm]

On Thu, Mar 05, 2020 at 12:23:46 +0100, Ard Biesheuvel wrote:
> I no longer work for Linaro (and haven't for a while) so in anticipation
> of losing access to my @linaro.org mailbox, let's switch to the ARM one
> for my Tiancore contributions and maintainerships. Update the .mailmap
> at the same time so the tooling can rewrite history where needed.

I have no issue either way, but I also don't think a proper decision
was made last time around the .mailmap topic came up as to whether it
was intended to span organisation changes.

At present it does not in this project, and I would prefer for such a
change to happen after an explicit policy decision rather than by
accident.

In the meantime, for the Maintainers.txt changes:
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

/
    Leif

> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> While I'm working out some kinks with the Arm corporate email infrastructure,
> I may elect to sit on this patch for a couple of weeks at least, but I'm
> sending it out now so everybody is aware.
> 
>  .mailmap        |  3 ++-
>  Maintainers.txt | 16 ++++++++--------
>  2 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/.mailmap b/.mailmap
> index ae179b0886c7..d52399b02772 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -13,7 +13,8 @@
>  Aaron Li <aaron.li@intel.com> <songpeng.li@intel.com>
>  Antoine Cœur <coeur@gmx.fr>
>  Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
> -Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
> +Ard Biesheuvel <ard.biesheuvel@arm.com> <abiesheuvel@Edk2>
> +Ard Biesheuvel <ard.biesheuvel@arm.com> <ard.biesheuvel@linaro.org>
>  Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
>  Baraneedharan Anbazhagan <anbazhagan@hp.com>
>  Chasel Chiu <chasel.chiu@intel.com>
> diff --git a/Maintainers.txt b/Maintainers.txt
> index 342bb8d0850c..9aa7e164fa87 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -88,7 +88,7 @@ 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@nuviainc.com>          (ARM/AArch64)
> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>    (ARM/AArch64)
>  
>  EDK II Architectures:
>  ---------------------
> @@ -96,7 +96,7 @@ ARM, AARCH64
>  F: */AArch64/
>  F: */Arm/
>  M: Leif Lindholm <leif@nuviainc.com>
> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>  
>  EDK II Continuous Integration:
>  ------------------------------
> @@ -127,19 +127,19 @@ ArmPkg
>  F: ArmPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
>  M: Leif Lindholm <leif@nuviainc.com>
> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>  
>  ArmPlatformPkg
>  F: ArmPlatformPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
>  M: Leif Lindholm <leif@nuviainc.com>
> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>  
>  ArmVirtPkg
>  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>
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>  R: Leif Lindholm <leif@nuviainc.com>
>  
>  ArmVirtPkg: modules used on Xen
> @@ -174,7 +174,7 @@ EmbeddedPkg
>  F: EmbeddedPkg/
>  W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
>  M: Leif Lindholm <leif@nuviainc.com>
> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>  
>  EmulatorPkg
>  F: EmulatorPkg/
> @@ -386,7 +386,7 @@ F: OvmfPkg/
>  W: http://www.tianocore.org/ovmf/
>  M: Jordan Justen <jordan.l.justen@intel.com>
>  M: Laszlo Ersek <lersek@redhat.com>
> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>  S: Maintained
>  
>  OvmfPkg: Xen-related modules
> @@ -488,7 +488,7 @@ S: Maintained
>  
>  StandaloneMmPkg
>  F: StandaloneMmPkg/
> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> +M: Ard Biesheuvel <ard.biesheuvel@arm.com>
>  M: Sami Mujawar <sami.mujawar@arm.com>
>  M: Jiewen Yao <jiewen.yao@intel.com>
>  R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> -- 
> 2.17.1
> 

Re: [PATCH] Maintainers: switch to my Arm email address

[Laszlo Ersek]

On 03/05/20 13:30, Leif Lindholm wrote:
> On Thu, Mar 05, 2020 at 12:23:46 +0100, Ard Biesheuvel wrote:
>> I no longer work for Linaro (and haven't for a while) so in anticipation
>> of losing access to my @linaro.org mailbox, let's switch to the ARM one
>> for my Tiancore contributions and maintainerships. Update the .mailmap
>> at the same time so the tooling can rewrite history where needed.
> 
> I have no issue either way, but I also don't think a proper decision
> was made last time around the .mailmap topic came up as to whether it
> was intended to span organisation changes.

We said that stewards wouldn't have the power to approve such, but the
subject contributors would.

> At present it does not in this project, and I would prefer for such a
> change to happen after an explicit policy decision rather than by
> accident.
> 
> In the meantime, for the Maintainers.txt changes:
> Reviewed-by: Leif Lindholm <leif@nuviainc.com>

I'm fine with both keeping and dropping the .mailmap hunk, as it is
being proposed by Ard.

So either way:

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

Thanks
Laszlo

Re: [PATCH] Maintainers: switch to my Arm email address

[Ard Biesheuvel]

On Thu, 5 Mar 2020 at 15:33, Laszlo Ersek <lersek@redhat.com> wrote:
>
> On 03/05/20 13:30, Leif Lindholm wrote:
> > On Thu, Mar 05, 2020 at 12:23:46 +0100, Ard Biesheuvel wrote:
> >> I no longer work for Linaro (and haven't for a while) so in anticipation
> >> of losing access to my @linaro.org mailbox, let's switch to the ARM one
> >> for my Tiancore contributions and maintainerships. Update the .mailmap
> >> at the same time so the tooling can rewrite history where needed.
> >
> > I have no issue either way, but I also don't think a proper decision
> > was made last time around the .mailmap topic came up as to whether it
> > was intended to span organisation changes.
>
> We said that stewards wouldn't have the power to approve such, but the
> subject contributors would.
>
> > At present it does not in this project, and I would prefer for such a
> > change to happen after an explicit policy decision rather than by
> > accident.
> >
> > In the meantime, for the Maintainers.txt changes:
> > Reviewed-by: Leif Lindholm <leif@nuviainc.com>
>
> I'm fine with both keeping and dropping the .mailmap hunk, as it is
> being proposed by Ard.
>
> So either way:
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>

Thanks all

Given the fact that the mailmap is only used when explicitly asked for
it, adding the entry is not going to make it more likely that
unsuspecting contributors will end up using my @arm.com email address
after looking at my contributions in the Git history. So I dropped the
mailmap hunk and pushed this to edk2 master.