X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Maintainers.txt;h=146d8aca93f0eba3bf46750ef1595f3c1cf1809e;hb=e1ed55738ec30db364a00d0ddac50dbbf3671795;hp=6b89bec55e2e60ffdd3de0f3441274b93118b76f;hpb=410c4d00d9f7e369d1ce183e9e8de98cb59c4d20;p=mirror_edk2.git

diff --git a/Maintainers.txt b/Maintainers.txt
index 6b89bec55e..146d8aca93 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -98,6 +98,29 @@ F: */Arm/
 M: Leif Lindholm <leif.lindholm@linaro.org>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
+EDK II Continuous Integration:
+------------------------------
+.azurepipelines/
+F: .azurepipelines/
+M: Sean Brogan <sean.brogan@microsoft.com>
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>
+R: Michael D Kinney <michael.d.kinney@intel.com>
+R: Liming Gao <liming.gao@intel.com>
+
+.mergify/
+F: .mergify/
+M: Michael D Kinney <michael.d.kinney@intel.com>
+M: Liming Gao <liming.gao@intel.com>
+R: Sean Brogan <sean.brogan@microsoft.com>
+R: Bret Barkelew <Bret.Barkelew@microsoft.com>
+
+.pytool/
+F: .pytool/
+M: Sean Brogan <sean.brogan@microsoft.com>
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>
+R: Michael D Kinney <michael.d.kinney@intel.com>
+R: Liming Gao <liming.gao@intel.com>
+
 EDK II Packages:
 ----------------
 ArmPkg
@@ -127,7 +150,7 @@ F: ArmVirtPkg/PrePi/
 F: ArmVirtPkg/XenAcpiPlatformDxe/
 F: ArmVirtPkg/XenPlatformHasAcpiDtDxe/
 F: ArmVirtPkg/XenioFdtDxe/
-R: Julien Grall <julien.grall@arm.com>
+R: Julien Grall <julien@xen.org>
 
 BaseTools
 F: BaseTools/
@@ -354,8 +377,9 @@ M: Liming Gao <liming.gao@intel.com>
 NetworkPkg
 F: NetworkPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
-M: Siyuan Fu <siyuan.fu@intel.com>
 M: Jiaxin Wu <jiaxin.wu@intel.com>
+M: Maciej Rabeda <maciej.rabeda@linux.intel.com>
+R: Siyuan Fu <siyuan.fu@intel.com>
 
 OvmfPkg
 F: OvmfPkg/
@@ -396,7 +420,7 @@ F: OvmfPkg/XenPvBlkDxe/
 F: OvmfPkg/XenResetVector/
 F: OvmfPkg/XenTimerDxe/
 R: Anthony Perard <anthony.perard@citrix.com>
-R: Julien Grall <julien.grall@arm.com>
+R: Julien Grall <julien@xen.org>
 
 OvmfPkg: TCG- and TPM2-related modules
 F: OvmfPkg/Include/IndustryStandard/QemuTpm.h
@@ -457,6 +481,7 @@ S: Maintained
 
 StandaloneMmPkg
 F: StandaloneMmPkg/
-M: Achin Gupta <achin.gupta@arm.com>
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M: Sami Mujawar <sami.mujawar@arm.com>
 M: Jiewen Yao <jiewen.yao@intel.com>
 R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>