X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Maintainers.txt;h=7772926b2fb11d6e1b347884120bbb1b76afbbd3;hb=2bf671f11fc829af0828c006539c861d6bbef7e8;hp=07feb16e6f8375a7c0a60fd38b851453ef5a9b01;hpb=03d3e7b2edbf3b8ba85b55b34e0d01f63cb16e6a;p=mirror_edk2.git

diff --git a/Maintainers.txt b/Maintainers.txt
index 07feb16e6f..7772926b2f 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -80,12 +80,14 @@ ArmVirtPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
 M: Laszlo Ersek <lersek@redhat.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-R: Julien Grall <julien.grall@linaro.org>
+R: Julien Grall <julien.grall@arm.com>
+   (Xen modules)
 
 BaseTools
 W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
-M: Yonghong Zhu <yonghong.zhu@intel.com>
+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
@@ -101,18 +103,14 @@ 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
-M: Ruiyu Ni <ruiyu.ni@intel.com>
-M: Hao Wu <hao.a.wu@intel.com>
+R: Gang Wei <gang.wei@intel.com>
+R: Jian Wang <jian.j.wang@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>
+M: Alexei Fedorov <Alexei.Fedorov@arm.com>
 
 EdkCompatibilityPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/EdkCompatibilityPkg
@@ -127,12 +125,12 @@ 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>
+M: Ray Ni <ray.ni@intel.com>
 S: Maintained
 
 FatPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/Edk2-fat-driver
-M: Ruiyu Ni <ruiyu.ni@intel.com>
+M: Ray Ni <ray.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
 
@@ -152,36 +150,43 @@ M: Liming Gao <liming.gao@intel.com>
 
 IntelFsp2Pkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2Pkg
-M: Jiewen Yao <jiewen.yao@intel.com>
 M: Chasel Chiu <chasel.chiu@intel.com>
+R: Nate DeSimone <nathaniel.l.desimone@intel.com>
+R: Star Zeng <star.zeng@intel.com>
 
 IntelFsp2WrapperPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2WrapperPkg
-M: Jiewen Yao <jiewen.yao@intel.com>
 M: Chasel Chiu <chasel.chiu@intel.com>
+R: Nate DeSimone <nathaniel.l.desimone@intel.com>
+R: Star Zeng <star.zeng@intel.com>
 
 IntelFspPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFspPkg
-M: Jiewen Yao <jiewen.yao@intel.com>
+M: Chasel Chiu <chasel.chiu@intel.com>
+R: Nate DeSimone <nathaniel.l.desimone@intel.com>
+R: Star Zeng <star.zeng@intel.com>
 
 IntelFspWrapperPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFspWrapperPkg
-M: Jiewen Yao <jiewen.yao@intel.com>
+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: Ruiyu Ni <ruiyu.ni@intel.com>
+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: Star Zeng <star.zeng@intel.com>
 M: Jian J Wang <jian.j.wang@intel.com>
+M: Hao Wu <hao.a.wu@intel.com>
 M: NetworkPkg maintainers
   (Universal/Network and related libraries, header files)
-R: Ruiyu Ni <ruiyu.ni@intel.com>
+R: Ray Ni <ray.ni@intel.com>
   (especially for Bus, Universal/Console, Universal/Disk,
    Universal/BdsDxe and related libraries, header files)
+R: Star Zeng <star.zeng@intel.com>
 
 MdePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdePkg
@@ -195,7 +200,7 @@ M: Jiaxin Wu <jiaxin.wu@intel.com>
 
 Nt32Pkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
-M: Ruiyu Ni <ruiyu.ni@intel.com>
+M: Ray Ni <ray.ni@intel.com>
 M: Hao Wu <hao.a.wu@intel.com>
 
 Omap35xxPkg
@@ -205,7 +210,7 @@ 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>
+M: Ray Ni <ray.ni@intel.com>
 
 OvmfPkg
 W: http://www.tianocore.org/ovmf/
@@ -213,12 +218,18 @@ M: Jordan Justen <jordan.l.justen@intel.com>
 M: Laszlo Ersek <lersek@redhat.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 R: Anthony Perard <anthony.perard@citrix.com>
-R: Julien Grall <julien.grall@linaro.org>
+   (Xen modules)
+R: Julien Grall <julien.grall@arm.com>
+   (Xen modules)
+R: Marc-André Lureau <marcandre.lureau@redhat.com>
+   (TPM2 modules)
+R: Stefan Berger <stefanb@linux.ibm.com>
+   (TPM2 modules)
 S: Maintained
 
 PcAtChipsetPkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg
-M: Ruiyu Ni <ruiyu.ni@intel.com>
+M: Ray Ni <ray.ni@intel.com>
 
 QuarkPlatformPkg, QuarkSocPkg
 M: Michael D Kinney <michael.d.kinney@intel.com>
@@ -232,14 +243,14 @@ M: Jiewen Yao <jiewen.yao@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: 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: Ruiyu Ni <ruiyu.ni@intel.com>
+M: Ray Ni <ray.ni@intel.com>
 
 SignedCapsulePkg
 W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
@@ -258,7 +269,7 @@ 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>
+M: Ray Ni <ray.ni@intel.com>
 R: Laszlo Ersek <lersek@redhat.com>
 
 Vlv2DeviceRefCodePkg