X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Maintainers.txt;h=9a36f0232b35aab53441df3006e16f200f305f44;hb=18a700945f200552fbba9ba4b1b519016e1ec3c1;hp=7295cd6b8368fe9b951be23dfb51a63d4e625311;hpb=f8c85cb7ec8869d3144edb45e0019727f03364e4;p=mirror_edk2.git

diff --git a/Maintainers.txt b/Maintainers.txt
index 7295cd6b83..9a36f0232b 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -51,9 +51,8 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/Security
 
 EDK II Releases:
 ----------------
-UDK2014
-W: http://www.tianocore.org/udk2014/
-S: Supported
+W: https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning
+M: Liming Gao <liming.gao@intel.com>
 
 EDK II Packages:
 ----------------
@@ -105,16 +104,15 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/DuetPkg
 M: Ruiyu Ni <ruiyu.ni@intel.com>
 M: Hao Wu <hao.a.wu@intel.com>
 
+DynamicTablesPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/DynamicTablesPkg
+M: Evan Lloyd <Evan.Lloyd@arm.com>
+M: Sami Mujawar <Sami.Mujawar@arm.com>
+
 EdkCompatibilityPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/EdkCompatibilityPkg
 M: Liming Gao <liming.gao@intel.com>
 
-EdkShellPkg, EdkShellBinPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/EdkShellPkg
-M: Ruiyu Ni <ruiyu.ni@intel.com>
-T: svn - https://svn.code.sf.net/p/efi-shell/code/trunk/Shell/
-S: Obsolete (Use ShellPkg & ShellBinPkg instead)
-
 EmbeddedPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
 M: Leif Lindholm <leif.lindholm@linaro.org>
@@ -124,14 +122,20 @@ EmulatorPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
 M: Jordan Justen <jordan.l.justen@intel.com>
 M: Andrew Fish <afish@apple.com>
+M: Ruiyu Ni <ruiyu.ni@intel.com>
 S: Maintained
 
-FatPkg, FatBinPkg
+FatPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/Edk2-fat-driver
 M: Ruiyu Ni <ruiyu.ni@intel.com>
 T: svn - https://svn.code.sf.net/p/edk2-fatdriver2/code/trunk/EnhancedFat
 T: git - https://github.com/tianocore/edk2-FatPkg.git
 
+FmpDevicePkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/FmpDevicePkg
+M: Star Zeng <star.zeng@intel.com>
+M: Michael D Kinney <michael.d.kinney@intel.com>
+
 IntelFrameworkModulePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFrameworkModulePkg
 M: Liming Gao <liming.gao@intel.com>
@@ -161,13 +165,13 @@ M: Jiewen Yao <jiewen.yao@intel.com>
 
 IntelSiliconPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelSiliconPkg
-M: Jiewen Yao <jiewen.yao@intel.com>
+M: Ruiyu Ni <ruiyu.ni@intel.com>
 M: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
 
 MdeModulePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdeModulePkg
 M: Star Zeng <star.zeng@intel.com>
-M: Eric Dong <eric.dong@intel.com>
+M: Jian J Wang <jian.j.wang@intel.com>
 M: NetworkPkg maintainers
   (Universal/Network and related libraries, header files)
 R: Ruiyu Ni <ruiyu.ni@intel.com>
@@ -235,6 +239,7 @@ M: Ruiyu Ni <ruiyu.ni@intel.com>
 SignedCapsulePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
 M: Jiewen Yao <jiewen.yao@intel.com>
+M: Chao Zhang <chao.b.zhang@intel.com>
 
 SourceLevelDebugPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPkg
@@ -248,19 +253,16 @@ M: Jaben Carsey <jaben.carsey@intel.com>
 UefiCpuPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg
 M: Eric Dong <eric.dong@intel.com>
+M: Ruiyu Ni <ruiyu.ni@intel.com>
 R: Laszlo Ersek <lersek@redhat.com>
 
-UnixPkg
-W: https://github.com/tianocore/tianocore.github.io/wiki/UnixPkg
-S: Obsolete (Use EmulatorPkg instead)
-
 Vlv2DeviceRefCodePkg
-M: David Wei <david.wei@intel.com>
-M: Mang Guo <mang.guo@intel.com>
+M: Zailiang Sun <zailiang.sun@intel.com>
+M: Yi Qian <yi.qian@intel.com>
 
 Vlv2TbltDevicePkg
-M: David Wei <david.wei@intel.com>
-M: Mang Guo <mang.guo@intel.com>
+M: Zailiang Sun <zailiang.sun@intel.com>
+M: Yi Qian <yi.qian@intel.com>
 
 StandaloneMmPkg
 M: Achin Gupta <achin.gupta@arm.com>