X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Maintainers.txt;h=e52f044bec638e9768345cb1825331474cdebb93;hb=87fc0601fa9a98d5f86a81fc20d2cc8ef936e064;hp=de0b6a284e1c9447beddb8ab7667e3c9a535d439;hpb=147e6e70f2be2d3fdebcb2bd366324a24634d562;p=mirror_edk2.git

diff --git a/Maintainers.txt b/Maintainers.txt
index de0b6a284e..e52f044bec 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -1,4 +1,4 @@
-EDK II Maintainers
+EDK II Maintainers
 ==================
 
 This file provides information about the primary maintainers for
@@ -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
@@ -84,14 +84,6 @@ BaseTools
 W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
 M: Bob Feng <bob.c.feng@intel.com>
 M: Liming Gao <liming.gao@intel.com>
-R: Yonghong Zhu <yonghong.zhu@intel.com>
-
-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
@@ -159,17 +151,10 @@ M: Chasel Chiu <chasel.chiu@intel.com>
 R: Nate DeSimone <nathaniel.l.desimone@intel.com>
 R: Star Zeng <star.zeng@intel.com>
 
-IntelSiliconPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/IntelSiliconPkg
-M: Ray Ni <ray.ni@intel.com>
-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 A Wu <hao.a.wu@intel.com>
-M: NetworkPkg maintainers
-  (Universal/Network and related libraries, header files)
 R: Ray Ni <ray.ni@intel.com>
   (especially for Bus, Universal/Console, Universal/Disk,
    Universal/BdsDxe and related libraries, header files)
@@ -198,6 +183,8 @@ R: Marc-André Lureau <marcandre.lureau@redhat.com>
    (TPM2 modules)
 R: Stefan Berger <stefanb@linux.ibm.com>
    (TPM2 modules)
+R: David Woodhouse <dwmw2@infradead.org>
+   (CSM modules)
 S: Maintained
 
 PcAtChipsetPkg
@@ -214,6 +201,7 @@ 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:
@@ -237,6 +225,13 @@ M: Eric Dong <eric.dong@intel.com>
 M: Ray Ni <ray.ni@intel.com>
 R: Laszlo Ersek <lersek@redhat.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>
 M: Jiewen Yao <jiewen.yao@intel.com>