Maintainers.txt: update email address for Leif Lindholm

[mirror_edk2.git] / Maintainers.txt

diff --git a/Maintainers.txt b/Maintainers.txt
index adc9811880850a7c29b10b8e9aae6546ca2feefe..ca9da289253486441e2cb24d0157dd2737a00ffb 100644 (file)
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -70,7 +70,7 @@ Tianocore Stewards
 F: *\r
 M: Andrew Fish <afish@apple.com>\r
 M: Laszlo Ersek <lersek@redhat.com>\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
+M: Leif Lindholm <leif@nuviainc.com>\r
 M: Michael D Kinney <michael.d.kinney@intel.com>\r
 \r
 Responsible Disclosure, Reporting Security Issues\r
@@ -87,7 +87,7 @@ UEFI Shell Binaries (ShellBinPkg.zip) from EDK II Releases:
 W: https://github.com/tianocore/edk2/releases/\r
 M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)\r
 M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)\r
-M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)\r
+M: Leif Lindholm <leif@nuviainc.com>          (ARM/AArch64)\r
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)\r
 \r
 EDK II Architectures:\r
@@ -95,21 +95,44 @@ EDK II Architectures:
 ARM, AARCH64\r
 F: */AArch64/\r
 F: */Arm/\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
+M: Leif Lindholm <leif@nuviainc.com>\r
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
 \r
+EDK II Continuous Integration:\r
+------------------------------\r
+.azurepipelines/\r
+F: .azurepipelines/\r
+M: Sean Brogan <sean.brogan@microsoft.com>\r
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>\r
+R: Michael D Kinney <michael.d.kinney@intel.com>\r
+R: Liming Gao <liming.gao@intel.com>\r
+\r
+.mergify/\r
+F: .mergify/\r
+M: Michael D Kinney <michael.d.kinney@intel.com>\r
+M: Liming Gao <liming.gao@intel.com>\r
+R: Sean Brogan <sean.brogan@microsoft.com>\r
+R: Bret Barkelew <Bret.Barkelew@microsoft.com>\r
+\r
+.pytool/\r
+F: .pytool/\r
+M: Sean Brogan <sean.brogan@microsoft.com>\r
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>\r
+R: Michael D Kinney <michael.d.kinney@intel.com>\r
+R: Liming Gao <liming.gao@intel.com>\r
+\r
 EDK II Packages:\r
 ----------------\r
 ArmPkg\r
 F: ArmPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
+M: Leif Lindholm <leif@nuviainc.com>\r
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
 \r
 ArmPlatformPkg\r
 F: ArmPlatformPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
+M: Leif Lindholm <leif@nuviainc.com>\r
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
 \r
 ArmVirtPkg\r
@@ -117,7 +140,7 @@ F: ArmVirtPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg\r
 M: Laszlo Ersek <lersek@redhat.com>\r
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
-R: Leif Lindholm <leif.lindholm@linaro.org>\r
+R: Leif Lindholm <leif@nuviainc.com>\r
 \r
 ArmVirtPkg: modules used on Xen\r
 F: ArmVirtPkg/ArmVirtXen.*\r
@@ -127,7 +150,7 @@ F: ArmVirtPkg/PrePi/
 F: ArmVirtPkg/XenAcpiPlatformDxe/\r
 F: ArmVirtPkg/XenPlatformHasAcpiDtDxe/\r
 F: ArmVirtPkg/XenioFdtDxe/\r
-R: Julien Grall <julien.grall@arm.com>\r
+R: Julien Grall <julien@xen.org>\r
 \r
 BaseTools\r
 F: BaseTools/\r
@@ -150,7 +173,7 @@ M: Alexei Fedorov <Alexei.Fedorov@arm.com>
 EmbeddedPkg\r
 F: EmbeddedPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
+M: Leif Lindholm <leif@nuviainc.com>\r
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
 \r
 EmulatorPkg\r
@@ -355,6 +378,7 @@ NetworkPkg
 F: NetworkPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg\r
 M: Jiaxin Wu <jiaxin.wu@intel.com>\r
+M: Maciej Rabeda <maciej.rabeda@linux.intel.com>\r
 R: Siyuan Fu <siyuan.fu@intel.com>\r
 \r
 OvmfPkg\r
@@ -396,7 +420,7 @@ F: OvmfPkg/XenPvBlkDxe/
 F: OvmfPkg/XenResetVector/\r
 F: OvmfPkg/XenTimerDxe/\r
 R: Anthony Perard <anthony.perard@citrix.com>\r
-R: Julien Grall <julien.grall@arm.com>\r
+R: Julien Grall <julien@xen.org>\r
 \r
 OvmfPkg: TCG- and TPM2-related modules\r
 F: OvmfPkg/Include/IndustryStandard/QemuTpm.h\r
@@ -457,6 +481,7 @@ S: Maintained
 \r
 StandaloneMmPkg\r
 F: StandaloneMmPkg/\r
-M: Achin Gupta <achin.gupta@arm.com>\r
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
+M: Sami Mujawar <sami.mujawar@arm.com>\r
 M: Jiewen Yao <jiewen.yao@intel.com>\r
 R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>\r