X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Maintainers.txt;h=77df275eb221f69e2d28598b1142453a98485d43;hp=f6fe81dc34b1070ef10610d57f1b909b31b937ce;hb=22e8cd18928efa0d80fc15cbdfb490135b43821b;hpb=427760786f0d608744c801ad3bcaed19155ec1d2

diff --git a/Maintainers.txt b/Maintainers.txt
index f6fe81dc34..77df275eb2 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -30,9 +30,9 @@ EDK II
 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
 -------------------------------------------------
@@ -48,23 +48,33 @@ 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
@@ -75,6 +85,7 @@ S: Maintained
 CryptoPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/CryptoPkg
 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
@@ -92,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
@@ -113,6 +125,17 @@ 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
@@ -122,17 +145,25 @@ 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: Siyuan Fu <siyuan.fu@intel.com>
+M: Jiaxin Wu <jiaxin.wu@intel.com>
 
 Nt32Pkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
@@ -140,7 +171,8 @@ 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
@@ -158,23 +190,42 @@ 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>
+
+SignedCapsulePkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
+M: Jiewen Yao <jiewen.yao@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
@@ -186,8 +237,8 @@ S: Obsolete (Use EmulatorPkg instead)
 
 Vlv2DeviceRefCodePkg
 M: David Wei <david.wei@intel.com>
-M: Tim He <tim.he@intel.com>
+M: Mang Guo <mang.guo@intel.com>
 
 Vlv2TbltDevicePkg
 M: David Wei <david.wei@intel.com>
-M: Tim He <tim.he@intel.com>
\ No newline at end of file
+M: Mang Guo <mang.guo@intel.com>