X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Maintainers.txt;h=146d8aca93f0eba3bf46750ef1595f3c1cf1809e;hb=c0328cf3803b215a62f05633024f9dd6e5b805a0;hp=f348d70df3329c815265cc333f7239846007ee93;hpb=d7bf973e43ad949706f936f61cd6be8e63ce136f;p=mirror_edk2.git

diff --git a/Maintainers.txt b/Maintainers.txt
index f348d70df3..146d8aca93 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -82,6 +82,14 @@ EDK II Releases:
 W: https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning
 M: Liming Gao <liming.gao@intel.com>
 
+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: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
+
 EDK II Architectures:
 ---------------------
 ARM, AARCH64
@@ -90,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
@@ -119,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/
@@ -346,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/
@@ -388,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
@@ -421,13 +453,6 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
 M: Ray Ni <ray.ni@intel.com>
 M: Zhichao Gao <zhichao.gao@intel.com>
 
-Maintainers for stable Shell binaries generation
-when need to publish Shell binaries with edk2 release:
-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: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
-
 SignedCapsulePkg
 F: SignedCapsulePkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
@@ -456,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>