X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Maintainers.txt;h=94d338027bfe4eb73ea1af8da90af4963ceb3588;hp=6775db5eb008f88dcfb878362c01d204774e1a22;hb=5e6676302b6f740dbc3336fa199c05f51a62ee09;hpb=4202afa45dea319f80d753dc1b2ebbbcfb55dc29

diff --git a/Maintainers.txt b/Maintainers.txt
index 6775db5eb0..94d338027b 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -27,12 +27,12 @@ Descriptions of section entries:
 
 EDK II
 ------
-W: http://tianocore.github.io/edk2/
+W: http://www.tianocore.org/edk2/
 L: https://lists.sourceforge.net/lists/listinfo/edk2-devel
 T: git - https://github.com/tianocore/edk2.git
-T: git - https://bitbucket.org/tianocore/edk2.git
-T: git - http://git.code.sf.net/p/tianocore/edk2
-T: svn - https://svn.code.sf.net/p/edk2/code/trunk/edk2
+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
 
 Responsible Disclosure, Reporting Security Issues
 -------------------------------------------------
@@ -41,34 +41,51 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/Security
 EDK II Releases:
 ----------------
 UDK2014
-W: http://tianocore.github.io/udk2014/
+W: http://www.tianocore.org/udk2014/
 S: Supported
 
 EDK II Packages:
 ----------------
 AppPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/AppPkg
-M: Daryl Mcdaniel <daryl.mcdaniel@intel.com>
+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: Olivier Martin <olivier.martin@arm.com>
+M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 ArmPlatformPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
-M: Olivier Martin <olivier.martin@arm.com>
+M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+
+ArmVirtPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
+M: Laszlo Ersek <lersek@redhat.com>
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 BaseTools
 W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
-M: Yingke D Liu <yingke.d.liu@intel.com>
+M: Yonghong Zhu <yonghong.zhu@intel.com>
+M: Liming Gao <liming.gao@intel.com>
 
 BeagleBoardPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/BeagleBoardPkg
-M: Olivier Martin <olivier.martin@arm.com>
+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>
+S: Maintained
 
 CryptoPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/CryptoPkg
-M: Ye Ting <ting.ye@intel.com>
+M: Qin Long <qin.long@intel.com>
+M: Ting Ye <ting.ye@intel.com>
 
 DuetPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/DuetPkg
@@ -86,7 +103,8 @@ S: Obsolete (Use ShellPkg & ShellBinPkg instead)
 
 EmbeddedPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
-M: Olivier Martin <olivier.martin@arm.com>
+M: Leif Lindholm <leif.lindholm@linaro.org>
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 
 EmulatorPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
@@ -107,24 +125,45 @@ M: Jeff Fan <jeff.fan@intel.com>
 IntelFrameworkPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFrameworkPkg
 M: Michael D Kinney <michael.d.kinney@intel.com>
+M: Jeff Fan <jeff.fan@intel.com>
+
+IntelFsp2Pkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2Pkg
+M: Jiewen Yao <jiewen.yao@intel.com>
+M: Giri P Mudusuru <giri.p.mudusuru@intel.com>
+
+IntelFsp2WrapperPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2WrapperPkg
+M: Jiewen Yao <jiewen.yao@intel.com>
+M: Giri P Mudusuru <giri.p.mudusuru@intel.com>
 
 IntelFspPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFspPkg
+M: Jiewen Yao <jiewen.yao@intel.com>
 
 IntelFspWrapperPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFspWrapperPkg
+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: Giri P Mudusuru <giri.p.mudusuru@intel.com>
 
 MdeModulePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdeModulePkg
 M: Feng Tian <feng.tian@intel.com>
+M: Star Zeng <star.zeng@intel.com>
 
 MdePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdePkg
 M: Michael D Kinney <michael.d.kinney@intel.com>
+M: Liming Gao <liming.gao@intel.com>
 
 NetworkPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
-M: Qian Ouyang <qian.ouyang@intel.com>
+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
@@ -132,14 +171,15 @@ M: Ruiyu Ni <ruiyu.ni@intel.com>
 
 Omap35xxPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/Omap35xxPkg
-M: Olivier Martin <olivier.martin@arm.com>
+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: Ruiyu Ni <ruiyu.ni@intel.com>
 
 OvmfPkg
-W: http://tianocore.github.io/ovmf/
+W: http://www.tianocore.org/ovmf/
 M: Jordan Justen <jordan.l.justen@intel.com>
 M: Laszlo Ersek <lersek@redhat.com>
 S: Maintained
@@ -150,22 +190,38 @@ M: Ruiyu Ni <ruiyu.ni@intel.com>
 
 PerformancePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/PerformancePkg
-M: Daryl Mcdaniel <daryl.mcdaniel@intel.com>
+M: Daryl McDaniel <edk2-lists@mc2research.org>
+M: Jaben Carsey <jaben.carsey@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: Guo Dong <guo.dong@intel.com>
+M: Chao Zhang <chao.b.zhang@intel.com>
+
+ShellBinPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
+M: Jaben Carsey <jaben.carsey@intel.com>      (Ia32/X64)
+M: Ruiyu Ni <ruiyu.ni@intel.com>          (Ia32/X64)
+M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)
+M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)
 
-ShellPkg, ShellBinPkg
+ShellPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg
 M: Jaben Carsey <jaben.carsey@intel.com>
+M: Ruiyu Ni <ruiyu.ni@intel.com>
 
 SourceLevelDebugPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPkg
+M: Jeff Fan <jeff.fan@intel.com>
+M: Hao Wu <hao.a.wu@intel.com>
 
 StdLib, StdLibPrivateInternalFiles
 W: https://github.com/tianocore/tianocore.github.io/wiki/StdLib
-M: Daryl Mcdaniel <daryl.mcdaniel@intel.com>
+M: Daryl McDaniel <edk2-lists@mc2research.org>
+M: Jaben Carsey <jaben.carsey@intel.com>
 
 UefiCpuPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg
@@ -174,3 +230,11 @@ M: Jeff Fan <jeff.fan@intel.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>
+
+Vlv2TbltDevicePkg
+M: David Wei <david.wei@intel.com>
+M: Mang Guo <mang.guo@intel.com>