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 <af...@apple.com>
Cc: Laszlo Ersek <ler...@redhat.com>
Cc: Leif Lindholm <l...@nuviainc.com>
Cc: Michael D Kinney <michael.d.kin...@intel.com>
Cc: Ard Biesheuvel <ard.biesheu...@arm.com>
Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheu...@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheu...@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...@intel.com> <songpeng...@intel.com>
 Antoine Cœur <co...@gmx.fr>
 Antoine Cœur <co...@gmx.fr> <co...@gmx.fr>
-Ard Biesheuvel <ard.biesheu...@linaro.org> <abiesheuvel@Edk2>
+Ard Biesheuvel <ard.biesheu...@arm.com> <abiesheuvel@Edk2>
+Ard Biesheuvel <ard.biesheu...@arm.com> <ard.biesheu...@linaro.org>
 Ashley DeSimone <ashley.e.desim...@intel.com> 
<ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
 Baraneedharan Anbazhagan <anbazha...@hp.com>
 Chasel Chiu <chasel.c...@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...@intel.com>                  (Ia32/X64)
 M: Zhichao Gao <zhichao....@intel.com>        (Ia32/X64)
 M: Leif Lindholm <l...@nuviainc.com>          (ARM/AArch64)
-M: Ard Biesheuvel <ard.biesheu...@linaro.org> (ARM/AArch64)
+M: Ard Biesheuvel <ard.biesheu...@arm.com>    (ARM/AArch64)
 
 EDK II Architectures:
 ---------------------
@@ -96,7 +96,7 @@ ARM, AARCH64
 F: */AArch64/
 F: */Arm/
 M: Leif Lindholm <l...@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheu...@linaro.org>
+M: Ard Biesheuvel <ard.biesheu...@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 <l...@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheu...@linaro.org>
+M: Ard Biesheuvel <ard.biesheu...@arm.com>
 
 ArmPlatformPkg
 F: ArmPlatformPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
 M: Leif Lindholm <l...@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheu...@linaro.org>
+M: Ard Biesheuvel <ard.biesheu...@arm.com>
 
 ArmVirtPkg
 F: ArmVirtPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
 M: Laszlo Ersek <ler...@redhat.com>
-M: Ard Biesheuvel <ard.biesheu...@linaro.org>
+M: Ard Biesheuvel <ard.biesheu...@arm.com>
 R: Leif Lindholm <l...@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 <l...@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheu...@linaro.org>
+M: Ard Biesheuvel <ard.biesheu...@arm.com>
 
 EmulatorPkg
 F: EmulatorPkg/
@@ -386,7 +386,7 @@ F: OvmfPkg/
 W: http://www.tianocore.org/ovmf/
 M: Jordan Justen <jordan.l.jus...@intel.com>
 M: Laszlo Ersek <ler...@redhat.com>
-M: Ard Biesheuvel <ard.biesheu...@linaro.org>
+M: Ard Biesheuvel <ard.biesheu...@arm.com>
 S: Maintained
 
 OvmfPkg: Xen-related modules
@@ -488,7 +488,7 @@ S: Maintained
 
 StandaloneMmPkg
 F: StandaloneMmPkg/
-M: Ard Biesheuvel <ard.biesheu...@linaro.org>
+M: Ard Biesheuvel <ard.biesheu...@arm.com>
 M: Sami Mujawar <sami.muja...@arm.com>
 M: Jiewen Yao <jiewen....@intel.com>
 R: Supreeth Venkatesh <supreeth.venkat...@arm.com>
-- 
2.17.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55499): https://edk2.groups.io/g/devel/message/55499
Mute This Topic: https://groups.io/mt/71747415/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to