X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Maintainers.txt;h=3bab8a2db4e65d880a5ed7eb6ab01c9ef2d964a3;hp=8562c7e0101f95a679fb09c6bafcd86998b4e24b;hb=484dc05005ea80280e184b20a6b8a08636276777;hpb=40ffb6dc635d0848e6a1ed48b0819d2e5d177069

diff --git a/Maintainers.txt b/Maintainers.txt
index 8562c7e010..3bab8a2db4 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -40,7 +40,7 @@ Descriptions of section entries:
 EDK II
 ------
 W: http://www.tianocore.org/edk2/
-L: https://lists.01.org/mailman/listinfo/edk2-devel
+L: https://edk2.groups.io/g/devel/
 T: git - https://github.com/tianocore/edk2.git
 T: git (mirror) - https://bitbucket.org/tianocore/edk2.git
 T: svn (read-only, deprecated) - https://svn.code.sf.net/p/edk2/code/trunk/edk2
@@ -63,11 +63,6 @@ M: Liming Gao <liming.gao@intel.com>
 
 EDK II Packages:
 ----------------
-AppPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/AppPkg
-M: Daryl McDaniel <edk2-lists@mc2research.org>
-M: Jaben Carsey <jaben.carsey@intel.com>
-
 ArmPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
 M: Leif Lindholm <leif.lindholm@linaro.org>
@@ -91,18 +86,6 @@ M: Bob Feng <bob.c.feng@intel.com>
 M: Liming Gao <liming.gao@intel.com>
 R: Yonghong Zhu <yonghong.zhu@intel.com>
 
-BeagleBoardPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/BeagleBoardPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-
-CorebootModulePkg, CorebootPayloadPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/Coreboot_UEFI_payload
-M: Maurice Ma <maurice.ma@intel.com>
-M: Prince Agyeman <prince.agyeman@intel.com>
-M: Benjamin You <benjamin.you@intel.com>
-S: Maintained
-
 CryptoPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/CryptoPkg
 M: Jian Wang <jian.j.wang@intel.com>
@@ -177,9 +160,7 @@ M: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
 MdeModulePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdeModulePkg
 M: Jian J Wang <jian.j.wang@intel.com>
-M: Hao Wu <hao.a.wu@intel.com>
-M: NetworkPkg maintainers
-  (Universal/Network and related libraries, header files)
+M: Hao A Wu <hao.a.wu@intel.com>
 R: Ray Ni <ray.ni@intel.com>
   (especially for Bus, Universal/Console, Universal/Disk,
    Universal/BdsDxe and related libraries, header files)
@@ -195,20 +176,6 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
 M: Siyuan Fu <siyuan.fu@intel.com>
 M: Jiaxin Wu <jiaxin.wu@intel.com>
 
-Nt32Pkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
-M: Ray Ni <ray.ni@intel.com>
-M: Hao Wu <hao.a.wu@intel.com>
-
-Omap35xxPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/Omap35xxPkg
-M: Leif Lindholm <leif.lindholm@linaro.org>
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-
-OptionRomPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/OptionRomPkg
-M: Ray Ni <ray.ni@intel.com>
-
 OvmfPkg
 W: http://www.tianocore.org/ovmf/
 M: Jordan Justen <jordan.l.justen@intel.com>
@@ -228,27 +195,24 @@ PcAtChipsetPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg
 M: Ray Ni <ray.ni@intel.com>
 
-QuarkPlatformPkg, QuarkSocPkg
-M: Michael D Kinney <michael.d.kinney@intel.com>
-M: Kelly Steele <kelly.steele@intel.com>
-
 SecurityPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/SecurityPkg
 M: Chao Zhang <chao.b.zhang@intel.com>
 M: Jiewen Yao <jiewen.yao@intel.com>
 M: Jian Wang <jian.j.wang@intel.com>
 
-ShellBinPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
-M: Jaben Carsey <jaben.carsey@intel.com>      (Ia32/X64)
-M: Ray Ni <ray.ni@intel.com>          (Ia32/X64)
-M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
-
 ShellPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
 M: Jaben Carsey <jaben.carsey@intel.com>
 M: Ray Ni <ray.ni@intel.com>
+R: Zhichao Gao <zhichao.gao@intel.com>
+
+Maintainers for stable Shell binaries generation
+when need to publish Shell binaries with edk2 release:
+M: Jaben Carsey <jaben.carsey@intel.com>      (Ia32/X64)
+M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)
+M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
 
 SignedCapsulePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
@@ -257,12 +221,7 @@ M: Chao Zhang <chao.b.zhang@intel.com>
 
 SourceLevelDebugPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPkg
-M: Hao Wu <hao.a.wu@intel.com>
-
-StdLib, StdLibPrivateInternalFiles
-W: https://github.com/tianocore/tianocore.github.io/wiki/StdLib
-M: Daryl McDaniel <edk2-lists@mc2research.org>
-M: Jaben Carsey <jaben.carsey@intel.com>
+M: Hao A Wu <hao.a.wu@intel.com>
 
 UefiCpuPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg
@@ -270,13 +229,12 @@ M: Eric Dong <eric.dong@intel.com>
 M: Ray Ni <ray.ni@intel.com>
 R: Laszlo Ersek <lersek@redhat.com>
 
-Vlv2DeviceRefCodePkg
-M: Zailiang Sun <zailiang.sun@intel.com>
-M: Yi Qian <yi.qian@intel.com>
-
-Vlv2TbltDevicePkg
-M: Zailiang Sun <zailiang.sun@intel.com>
-M: Yi Qian <yi.qian@intel.com>
+UefiPayloadPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/UefiPayloadPkg
+M: Maurice Ma <maurice.ma@intel.com>
+M: Guo Dong <guo.dong@intel.com>
+M: Benjamin You <benjamin.you@intel.com>
+S: Maintained
 
 StandaloneMmPkg
 M: Achin Gupta <achin.gupta@arm.com>