X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Maintainers.txt;h=010ec3140473f63601e2ad29f6495e752ede56b1;hp=be77898ee2f100f2ebbe61ac97533948fecea0ba;hb=3a0b998bf3b58c74e56caa1ab11e3a0e200e5a77;hpb=c9e1e28b61953fe36af62e99ab886f40723423c4

diff --git a/Maintainers.txt b/Maintainers.txt
index be77898ee2..010ec31404 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -40,10 +40,9 @@ Descriptions of section entries:
 EDK II
 ------
 W: http://www.tianocore.org/edk2/
-L: https://lists.sourceforge.net/lists/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: git (mirror) - http://git.code.sf.net/p/tianocore/edk2
 T: svn (read-only, deprecated) - https://svn.code.sf.net/p/edk2/code/trunk/edk2
 
 Tianocore Stewards
@@ -64,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>
@@ -92,33 +86,16 @@ 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: Ting Ye <ting.ye@intel.com>
-R: Gang Wei <gang.wei@intel.com>
-R: Jian Wang <jian.j.wang@intel.com>
+M: Jian Wang <jian.j.wang@intel.com>
+R: Ting Ye <ting.ye@intel.com>
 
 DynamicTablesPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/DynamicTablesPkg
 M: Sami Mujawar <Sami.Mujawar@arm.com>
 M: Alexei Fedorov <Alexei.Fedorov@arm.com>
 
-EdkCompatibilityPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/EdkCompatibilityPkg
-M: Liming Gao <liming.gao@intel.com>
-
 EmbeddedPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
 M: Leif Lindholm <leif.lindholm@linaro.org>
@@ -183,7 +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: Hao A Wu <hao.a.wu@intel.com>
 M: NetworkPkg maintainers
   (Universal/Network and related libraries, header files)
 R: Ray Ni <ray.ni@intel.com>
@@ -201,20 +178,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>
@@ -234,27 +197,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
@@ -263,12 +223,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
@@ -276,13 +231,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>