]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Maintainers.txt
UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm
[mirror_edk2.git] / Maintainers.txt
index 71a34a284567b3a128945e5a295c918c0ce79504..d22224607af75594903ef169bd129718f4ab8c6a 100644 (file)
@@ -68,10 +68,9 @@ F: */
 Tianocore Stewards\r
 ------------------\r
 F: *\r
-M: Andrew Fish <afish@apple.com>\r
-M: Laszlo Ersek <lersek@redhat.com>\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
-M: Michael D Kinney <michael.d.kinney@intel.com>\r
+M: Andrew Fish <afish@apple.com> [ajfish]\r
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
 \r
 Responsible Disclosure, Reporting Security Issues\r
 -------------------------------------------------\r
@@ -80,44 +79,90 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/Security
 EDK II Releases:\r
 ----------------\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning\r
-M: Liming Gao <liming.gao@intel.com>\r
+M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
 \r
 UEFI Shell Binaries (ShellBinPkg.zip) from EDK II Releases:\r
 -----------------------------------------------------------\r
 W: https://github.com/tianocore/edk2/releases/\r
-M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)\r
-M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)\r
-M: Leif Lindholm <leif.lindholm@linaro.org>   (ARM/AArch64)\r
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org> (ARM/AArch64)\r
+M: Ray Ni <ray.ni@intel.com> [niruiyu]                        (Ia32/X64)\r
+M: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]           (Ia32/X64)\r
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]           (ARM/AArch64)\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel] (ARM/AArch64)\r
 \r
 EDK II Architectures:\r
 ---------------------\r
 ARM, AARCH64\r
 F: */AArch64/\r
 F: */Arm/\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+\r
+RISCV64\r
+F: */RiscV64/\r
+M: Sunil V L <sunilvl@ventanamicro.com> [vlsunil]\r
+R: Daniel Schaefer <git@danielschaefer.me> [JohnAZoidberg]\r
+\r
+LOONGARCH64\r
+F: */LoongArch64/\r
+M: Chao Li <lichao@loongson.cn> [kilaterlee]\r
+M: Baoqi Zhang <zhangbaoqi@loongson.cn> [zhangbaoqi-ls]\r
+R: Dongyan Qian <qiandongyan@loongson.cn> [MarsDoge]\r
+\r
+EDK II Continuous Integration:\r
+------------------------------\r
+.azurepipelines/\r
+F: .azurepipelines/\r
+M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]\r
+R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+\r
+.devcontainer/\r
+F: .devcontainer/\r
+M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]\r
+R: Chris Fernald <chris.fernald@outlook.com> [cfernald]\r
+\r
+.github/\r
+F: .github/\r
+M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]\r
+R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+\r
+.mergify/\r
+F: .mergify/\r
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+\r
+.pytool/\r
+F: .pytool/\r
+M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]\r
+R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
 \r
 EDK II Packages:\r
 ----------------\r
 ArmPkg\r
 F: ArmPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+R: Sami Mujawar <sami.mujawar@arm.com> [samimujawar]\r
 \r
 ArmPlatformPkg\r
 F: ArmPlatformPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
 \r
 ArmVirtPkg\r
 F: ArmVirtPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg\r
-M: Laszlo Ersek <lersek@redhat.com>\r
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
-R: Leif Lindholm <leif.lindholm@linaro.org>\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+R: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+R: Sami Mujawar <sami.mujawar@arm.com> [samimujawar]\r
+R: Gerd Hoffmann <kraxel@redhat.com> [kraxel]\r
 \r
 ArmVirtPkg: modules used on Xen\r
 F: ArmVirtPkg/ArmVirtXen.*\r
@@ -127,87 +172,100 @@ F: ArmVirtPkg/PrePi/
 F: ArmVirtPkg/XenAcpiPlatformDxe/\r
 F: ArmVirtPkg/XenPlatformHasAcpiDtDxe/\r
 F: ArmVirtPkg/XenioFdtDxe/\r
-R: Julien Grall <julien@xen.org>\r
+R: Julien Grall <julien@xen.org> [jgrall]\r
 \r
 BaseTools\r
 F: BaseTools/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools\r
-M: Bob Feng <bob.c.feng@intel.com>\r
-M: Liming Gao <liming.gao@intel.com>\r
+M: Bob Feng <bob.c.feng@intel.com> [BobCF]\r
+M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+R: Yuwei Chen <yuwei.chen@intel.com> [YuweiChen1110]\r
 \r
 CryptoPkg\r
 F: CryptoPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/CryptoPkg\r
-M: Jian J Wang <jian.j.wang@intel.com>\r
-R: Xiaoyu Lu <xiaoyux.lu@intel.com>\r
+M: Jiewen Yao <jiewen.yao@intel.com> [jyao1]\r
+M: Jian J Wang <jian.j.wang@intel.com> [jwang36]\r
+R: Xiaoyu Lu <xiaoyu1.lu@intel.com> [xiaoyuxlu]\r
+R: Guomin Jiang <guomin.jiang@intel.com> [guominjia]\r
 \r
 DynamicTablesPkg\r
 F: DynamicTablesPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/DynamicTablesPkg\r
-M: Sami Mujawar <Sami.Mujawar@arm.com>\r
-M: Alexei Fedorov <Alexei.Fedorov@arm.com>\r
+M: Sami Mujawar <Sami.Mujawar@arm.com> [samimujawar]\r
+M: Alexei Fedorov <Alexei.Fedorov@arm.com> [AlexeiFedorov]\r
+R: Pierre Gondois <pierre.gondois@arm.com> [pierregondois]\r
 \r
 EmbeddedPkg\r
 F: EmbeddedPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg\r
-M: Leif Lindholm <leif.lindholm@linaro.org>\r
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+M: Abner Chang <abner.chang@amd.com> [changab]\r
+R: Daniel Schaefer <git@danielschaefer.me> [JohnAZoidberg]\r
 \r
 EmulatorPkg\r
 F: EmulatorPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg\r
-M: Jordan Justen <jordan.l.justen@intel.com>\r
-M: Andrew Fish <afish@apple.com>\r
-M: Ray Ni <ray.ni@intel.com>\r
+M: Andrew Fish <afish@apple.com> [ajfish]\r
+M: Ray Ni <ray.ni@intel.com> [niruiyu]\r
 S: Maintained\r
 \r
+EmulatorPkg: Redfish-related modules\r
+F: EmulatorPkg/*Redfish*\r
+M: Abner Chang <abner.chang@amd.com> [changab]\r
+M: Nickle Wang <nicklew@nvidia.com> [nicklela]\r
+\r
 FatPkg\r
 F: FatPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/Edk2-fat-driver\r
-M: Ray Ni <ray.ni@intel.com>\r
+M: Ray Ni <ray.ni@intel.com> [niruiyu]\r
 T: svn - https://svn.code.sf.net/p/edk2-fatdriver2/code/trunk/EnhancedFat\r
 T: git - https://github.com/tianocore/edk2-FatPkg.git\r
 \r
 FmpDevicePkg\r
 F: FmpDevicePkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/FmpDevicePkg\r
-M: Liming Gao <liming.gao@intel.com>\r
-M: Michael D Kinney <michael.d.kinney@intel.com>\r
+M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+R: Guomin Jiang <guomin.jiang@intel.com> [guominjia]\r
+R: Wei6 Xu <wei6.xu@intel.com> [xuweiintel]\r
 \r
 IntelFsp2Pkg\r
 F: IntelFsp2Pkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2Pkg\r
-M: Chasel Chiu <chasel.chiu@intel.com>\r
-R: Nate DeSimone <nathaniel.l.desimone@intel.com>\r
-R: Star Zeng <star.zeng@intel.com>\r
+M: Chasel Chiu <chasel.chiu@intel.com> [ChaselChiu]\r
+M: Nate DeSimone <nathaniel.l.desimone@intel.com> [nate-desimone]\r
+R: Star Zeng <star.zeng@intel.com> [lzeng14]\r
 \r
 IntelFsp2WrapperPkg\r
 F: IntelFsp2WrapperPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFsp2WrapperPkg\r
-M: Chasel Chiu <chasel.chiu@intel.com>\r
-R: Nate DeSimone <nathaniel.l.desimone@intel.com>\r
-R: Star Zeng <star.zeng@intel.com>\r
+M: Chasel Chiu <chasel.chiu@intel.com> [ChaselChiu]\r
+M: Nate DeSimone <nathaniel.l.desimone@intel.com> [nate-desimone]\r
+R: Star Zeng <star.zeng@intel.com> [lzeng14]\r
 \r
 MdeModulePkg\r
 F: MdeModulePkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdeModulePkg\r
-M: Jian J Wang <jian.j.wang@intel.com>\r
-M: Hao A Wu <hao.a.wu@intel.com>\r
+M: Jian J Wang <jian.j.wang@intel.com> [jwang36]\r
+M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
 \r
 MdeModulePkg: ACPI modules\r
 F: MdeModulePkg/Include/*Acpi*.h\r
 F: MdeModulePkg/Universal/Acpi/\r
-R: Dandan Bi <dandan.bi@intel.com>\r
-R: Liming Gao <liming.gao@intel.com>\r
+R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]\r
+R: Dandan Bi <dandan.bi@intel.com> [dandanbi]\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
 \r
-MdeModulePkg: ACPI S3 modules\r
+MdeModulePkg: ACPI modules related to S3\r
 F: MdeModulePkg/*LockBox*/\r
 F: MdeModulePkg/Include/*BootScript*.h\r
 F: MdeModulePkg/Include/*LockBox*.h\r
 F: MdeModulePkg/Include/*S3*.h\r
 F: MdeModulePkg/Library/*S3*/\r
-R: Hao A Wu <hao.a.wu@intel.com>\r
-R: Eric Dong <eric.dong@intel.com>\r
+R: Hao A Wu <hao.a.wu@intel.com> [hwu25]\r
+R: Eric Dong <eric.dong@intel.com> [ydong10]\r
 \r
 MdeModulePkg: BDS modules\r
 F: MdeModulePkg/*BootManager*/\r
@@ -217,8 +275,8 @@ F: MdeModulePkg/Universal/DevicePathDxe/
 F: MdeModulePkg/Universal/DriverHealthManagerDxe/\r
 F: MdeModulePkg/Universal/LoadFileOnFv2/\r
 F: MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.*\r
-R: Zhichao Gao <zhichao.gao@intel.com>\r
-R: Ray Ni <ray.ni@intel.com>\r
+R: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
 \r
 MdeModulePkg: Console and Graphics modules\r
 F: MdeModulePkg/*Logo*/\r
@@ -232,8 +290,8 @@ F: MdeModulePkg/Include/Library/FrameBufferBltLib.h
 F: MdeModulePkg/Library/BaseBmpSupportLib/\r
 F: MdeModulePkg/Library/FrameBufferBltLib/\r
 F: MdeModulePkg/Universal/Console/\r
-R: Zhichao Gao <zhichao.gao@intel.com>\r
-R: Ray Ni <ray.ni@intel.com>\r
+R: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
 \r
 MdeModulePkg: Core services (PEI, DXE and Runtime) modules\r
 F: MdeModulePkg/*Mem*/\r
@@ -242,7 +300,6 @@ F: MdeModulePkg/*StatusCode*/
 F: MdeModulePkg/Application/DumpDynPcd/\r
 F: MdeModulePkg/Core/Dxe/\r
 F: MdeModulePkg/Core/DxeIplPeim/\r
-F: MdeModulePkg/Core/Pei/\r
 F: MdeModulePkg/Core/RuntimeDxe/\r
 F: MdeModulePkg/Include/*Mem*.h\r
 F: MdeModulePkg/Include/*Pcd*.h\r
@@ -260,19 +317,17 @@ F: MdeModulePkg/Library/DxeSecurityManagementLib/
 F: MdeModulePkg/Universal/PCD/\r
 F: MdeModulePkg/Universal/PlatformDriOverrideDxe/\r
 F: MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c\r
-R: Dandan Bi <dandan.bi@intel.com>\r
-R: Liming Gao <liming.gao@intel.com>\r
+R: Dandan Bi <dandan.bi@intel.com> [dandanbi]\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
 \r
 MdeModulePkg: Device and Peripheral modules\r
 F: MdeModulePkg/*PciHostBridge*/\r
-F: MdeModulePkg/*Serial*/\r
 F: MdeModulePkg/Bus/\r
 F: MdeModulePkg/Include/*Ata*.h\r
 F: MdeModulePkg/Include/*IoMmu*.h\r
 F: MdeModulePkg/Include/*NonDiscoverableDevice*.h\r
 F: MdeModulePkg/Include/*NvmExpress*.h\r
 F: MdeModulePkg/Include/*SdMmc*.h\r
-F: MdeModulePkg/Include/*SerialPort*.h\r
 F: MdeModulePkg/Include/*Ufs*.h\r
 F: MdeModulePkg/Include/*Usb*.h\r
 F: MdeModulePkg/Include/Guid/RecoveryDevice.h\r
@@ -281,10 +336,15 @@ F: MdeModulePkg/Include/Library/PciHostBridgeLib.h
 F: MdeModulePkg/Include/Ppi/StorageSecurityCommand.h\r
 F: MdeModulePkg/Include/Protocol/Ps2Policy.h\r
 F: MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/\r
-F: MdeModulePkg/Universal/Disk/\r
 F: MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/\r
-R: Hao A Wu <hao.a.wu@intel.com>\r
-R: Ray Ni <ray.ni@intel.com>\r
+R: Hao A Wu <hao.a.wu@intel.com> [hwu25]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+\r
+MdeModulePkg: Disk modules\r
+F: MdeModulePkg/Universal/Disk/\r
+R: Hao A Wu <hao.a.wu@intel.com> [hwu25]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+R: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]\r
 \r
 MdeModulePkg: Firmware Update modules\r
 F: MdeModulePkg/*Capsule*/\r
@@ -296,8 +356,8 @@ F: MdeModulePkg/Include/Protocol/FirmwareManagementProgress.h
 F: MdeModulePkg/Library/DisplayUpdateProgressLib*/\r
 F: MdeModulePkg/Library/FmpAuthenticationLibNull/\r
 F: MdeModulePkg/Universal/Esrt*/\r
-R: Hao A Wu <hao.a.wu@intel.com>\r
-R: Liming Gao <liming.gao@intel.com>\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+R: Guomin Jiang <guomin.jiang@intel.com> [guominjia]\r
 \r
 MdeModulePkg: HII and UI modules\r
 F: MdeModulePkg/*FileExplorer*/\r
@@ -313,27 +373,42 @@ F: MdeModulePkg/Library/CustomizedDisplayLib/
 F: MdeModulePkg/Universal/DisplayEngineDxe/\r
 F: MdeModulePkg/Universal/DriverSampleDxe/\r
 F: MdeModulePkg/Universal/SetupBrowserDxe/\r
-R: Dandan Bi <dandan.bi@intel.com>\r
-R: Eric Dong <eric.dong@intel.com>\r
+R: Dandan Bi <dandan.bi@intel.com> [dandanbi]\r
+R: Eric Dong <eric.dong@intel.com> [ydong10]\r
 \r
 MdeModulePkg: Management Mode (MM, SMM) modules\r
 F: MdeModulePkg/*Smi*/\r
 F: MdeModulePkg/*Smm*/\r
 F: MdeModulePkg/Include/*Smi*.h\r
 F: MdeModulePkg/Include/*Smm*.h\r
-R: Eric Dong <eric.dong@intel.com>\r
-R: Ray Ni <ray.ni@intel.com>\r
+R: Jiaxin Wu <jiaxin.wu@intel.com> [jiaxinwu]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+\r
+MdeModulePkg: Pei Core\r
+F: MdeModulePkg/Core/Pei/\r
+R: Dandan Bi <dandan.bi@intel.com> [dandanbi]\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+R: Debkumar De <debkumar.de@intel.com> [dde01]\r
+R: Catharine West <catharine.west@intel.com> [catharine-intl]\r
 \r
 MdeModulePkg: Reset modules\r
 F: MdeModulePkg/*Reset*/\r
 F: MdeModulePkg/Include/*Reset*.h\r
-R: Zhichao Gao <zhichao.gao@intel.com>\r
-R: Ray Ni <ray.ni@intel.com>\r
+R: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+\r
+MdeModulePkg: Serial modules\r
+F: MdeModulePkg/*Serial*/\r
+F: MdeModulePkg/Include/*SerialPort*.h\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+R: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]\r
 \r
 MdeModulePkg: SMBIOS modules\r
 F: MdeModulePkg/Universal/Smbios*/\r
-R: Dandan Bi <dandan.bi@intel.com>\r
-R: Star Zeng <star.zeng@intel.com>\r
+R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]\r
+R: Dandan Bi <dandan.bi@intel.com> [dandanbi]\r
+R: Star Zeng <star.zeng@intel.com> [lzeng14]\r
+R: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]\r
 \r
 MdeModulePkg: UEFI Variable modules\r
 F: MdeModulePkg/*Var*/\r
@@ -342,31 +417,105 @@ F: MdeModulePkg/Include/*/*Var*.h
 F: MdeModulePkg/Include/Guid/SystemNvDataGuid.h\r
 F: MdeModulePkg/Include/Protocol/SwapAddressRange.h\r
 F: MdeModulePkg/Universal/FaultTolerantWrite*/\r
-R: Hao A Wu <hao.a.wu@intel.com>\r
-R: Liming Gao <liming.gao@intel.com>\r
+R: Hao A Wu <hao.a.wu@intel.com> [hwu25]\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+\r
+MdeModulePkg: Universal Payload definitions\r
+F: MdeModulePkg/Include/UniversalPayload/\r
+R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+R: Gua Guo <gua.guo@intel.com> [gguo11837463]\r
 \r
 MdePkg\r
 F: MdePkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/MdePkg\r
-M: Michael D Kinney <michael.d.kinney@intel.com>\r
-M: Liming Gao <liming.gao@intel.com>\r
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\r
+R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]\r
 \r
 NetworkPkg\r
 F: NetworkPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg\r
-M: Jiaxin Wu <jiaxin.wu@intel.com>\r
-R: Siyuan Fu <siyuan.fu@intel.com>\r
+M: Maciej Rabeda <maciej.rabeda@linux.intel.com> [mrabeda]\r
+R: Siyuan Fu <siyuan.fu@intel.com> [sfu5]\r
 \r
 OvmfPkg\r
 F: OvmfPkg/\r
 W: http://www.tianocore.org/ovmf/\r
-M: Jordan Justen <jordan.l.justen@intel.com>\r
-M: Laszlo Ersek <lersek@redhat.com>\r
-M: Ard Biesheuvel <ard.biesheuvel@linaro.org>\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+M: Jiewen Yao <jiewen.yao@intel.com> [jyao1]\r
+R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]\r
+R: Gerd Hoffmann <kraxel@redhat.com> [kraxel]\r
 S: Maintained\r
 \r
+OvmfPkg: bhyve-related modules\r
+F: OvmfPkg/Bhyve/\r
+F: OvmfPkg/Include/IndustryStandard/Bhyve.h\r
+F: OvmfPkg/Include/Library/BhyveFwCtlLib.h\r
+F: OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c\r
+F: OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf\r
+F: OvmfPkg/Library/BhyveFwCtlLib/\r
+F: OvmfPkg/Library/PciHostBridgeLibScan/\r
+F: OvmfPkg/Library/PlatformBootManagerLibBhyve/\r
+F: OvmfPkg/Library/ResetSystemLib/BaseResetShutdownBhyve.c\r
+F: OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibBhyve.inf\r
+R: Rebecca Cran <rebecca@bsdio.com> [bcran]\r
+R: Peter Grehan <grehan@freebsd.org> [grehan-freebsd]\r
+\r
+OvmfPkg: cloudhv-related modules\r
+F: OvmfPkg/CloudHv/\r
+F: OvmfPkg/Include/IndustryStandard/CloudHv.h\r
+R: Sebastien Boeuf <sebastien.boeuf@intel.com> [sboeuf]\r
+\r
+OvmfPkg: microvm-related modules\r
+F: OvmfPkg/Microvm/\r
+F: OvmfPkg/Include/IndustryStandard/Microvm.h\r
+F: OvmfPkg/Library/ResetSystemLib/*Microvm.*\r
+R: Gerd Hoffmann <kraxel@redhat.com> [kraxel]\r
+\r
+OvmfPkg: CSM modules\r
+F: OvmfPkg/Csm/\r
+R: David Woodhouse <dwmw2@infradead.org> [dwmw2]\r
+\r
+OvmfPkg: Confidential Computing\r
+F: OvmfPkg/AmdSev/\r
+F: OvmfPkg/AmdSevDxe/\r
+F: OvmfPkg/Include/Guid/ConfidentialComputingSecret.h\r
+F: OvmfPkg/Include/Library/MemEncryptSevLib.h\r
+F: OvmfPkg/IoMmuDxe/CcIoMmu.*\r
+F: OvmfPkg/Library/BaseMemEncryptSevLib/\r
+F: OvmfPkg/Library/PlatformBootManagerLibGrub/\r
+F: OvmfPkg/Library/CcExitLib/\r
+F: OvmfPkg/PlatformPei/AmdSev.c\r
+F: OvmfPkg/ResetVector/\r
+F: OvmfPkg/Sec/\r
+R: Erdem Aktas <erdemaktas@google.com> [ruleof2]\r
+R: James Bottomley <jejb@linux.ibm.com> [jejb]\r
+R: Jiewen Yao <jiewen.yao@intel.com> [jyao1]\r
+R: Min Xu <min.m.xu@intel.com> [mxu9]\r
+R: Tom Lendacky <thomas.lendacky@amd.com> [tlendacky]\r
+R: Michael Roth <michael.roth@amd.com> [mdroth]\r
+\r
+OvmfPkg: FDT related modules\r
+F: OvmfPkg/Fdt\r
+R: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]\r
+R: Gerd Hoffmann <kraxel@redhat.com> [kraxel]\r
+R: Abner Chang <abner.chang@amd.com> [changab]\r
+\r
+OvmfPkg: LsiScsi driver\r
+F: OvmfPkg/LsiScsiDxe/\r
+R: Gary Lin <gary.lin@hpe.com> [lcp]\r
+\r
+OvmfPkg: TCG- and TPM2-related modules\r
+F: OvmfPkg/Include/IndustryStandard/QemuTpm.h\r
+F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c\r
+F: OvmfPkg/Library/Tcg2PhysicalPresenceLib*/\r
+F: OvmfPkg/PlatformPei/ClearCache.c\r
+F: OvmfPkg/Tcg/\r
+R: Marc-AndrĂ© Lureau <marcandre.lureau@redhat.com> [elmarco]\r
+R: Stefan Berger <stefanb@linux.ibm.com> [stefanberger]\r
+\r
 OvmfPkg: Xen-related modules\r
-F: OvmfPkg/AcpiPlatformDxe/Xen.c\r
 F: OvmfPkg/Include/Guid/XenBusRootDevice.h\r
 F: OvmfPkg/Include/Guid/XenInfo.h\r
 F: OvmfPkg/Include/IndustryStandard/Xen/\r
@@ -375,7 +524,7 @@ F: OvmfPkg/Include/Library/XenIoMmioLib.h
 F: OvmfPkg/Include/Library/XenPlatformLib.h\r
 F: OvmfPkg/Include/Protocol/XenBus.h\r
 F: OvmfPkg/Include/Protocol/XenIo.h\r
-F: OvmfPkg/Library/PciHostBridgeLib/XenSupport.c\r
+F: OvmfPkg/Library/PciHostBridgeLibScan/\r
 F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c\r
 F: OvmfPkg/Library/XenConsoleSerialPortLib/\r
 F: OvmfPkg/Library/XenHypercallLib/\r
@@ -384,79 +533,108 @@ F: OvmfPkg/Library/XenPlatformLib/
 F: OvmfPkg/Library/XenRealTimeClockLib/\r
 F: OvmfPkg/OvmfXen.*\r
 F: OvmfPkg/OvmfXenElfHeaderGenerator.c\r
-F: OvmfPkg/PlatformPei/MemDetect.c\r
-F: OvmfPkg/PlatformPei/Platform.*\r
-F: OvmfPkg/PlatformPei/Xen.*\r
-F: OvmfPkg/SmbiosPlatformDxe/*Xen.c\r
+F: OvmfPkg/SmbiosPlatformDxe/*Xen*\r
+F: OvmfPkg/XenAcpiPlatformDxe/\r
 F: OvmfPkg/XenBusDxe/\r
 F: OvmfPkg/XenIoPciDxe/\r
 F: OvmfPkg/XenIoPvhDxe/\r
 F: OvmfPkg/XenPlatformPei/\r
 F: OvmfPkg/XenPvBlkDxe/\r
 F: OvmfPkg/XenResetVector/\r
-F: OvmfPkg/XenTimerDxe/\r
-R: Anthony Perard <anthony.perard@citrix.com>\r
-R: Julien Grall <julien@xen.org>\r
+R: Anthony Perard <anthony.perard@citrix.com> [tperard]\r
+R: Julien Grall <julien@xen.org> [jgrall]\r
 \r
-OvmfPkg: TCG- and TPM2-related modules\r
-F: OvmfPkg/Include/IndustryStandard/QemuTpm.h\r
-F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c\r
-F: OvmfPkg/Library/Tcg2PhysicalPresenceLib*/\r
-F: OvmfPkg/PlatformPei/ClearCache.c\r
-F: OvmfPkg/Tcg/\r
-R: Marc-AndrĂ© Lureau <marcandre.lureau@redhat.com>\r
-R: Stefan Berger <stefanb@linux.ibm.com>\r
-\r
-OvmfPkg: CSM modules\r
-F: OvmfPkg/Csm/\r
-R: David Woodhouse <dwmw2@infradead.org>\r
+OvmfPkg: RISC-V Qemu Virt Platform\r
+F: OvmfPkg/RiscVVirt\r
+R: Sunil V L <sunilvl@ventanamicro.com> [vlsunil]\r
+R: Andrei Warkentin <andrei.warkentin@intel.com> [andreiw]\r
 \r
 PcAtChipsetPkg\r
 F: PcAtChipsetPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg\r
-M: Ray Ni <ray.ni@intel.com>\r
+M: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+\r
+PrmPkg\r
+F: PrmPkg/\r
+M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]\r
+M: Nate DeSimone <nathaniel.l.desimone@intel.com> [nate-desimone]\r
+\r
+PrmPkg: ACPI related modules\r
+R: Ankit Sinha <ankit.sinha@intel.com> [ankit13s]\r
+\r
+RedfishPkg: Redfish related modules\r
+F: RedfishPkg/\r
+M: Abner Chang <abner.chang@amd.com> [changab]\r
+M: Nickle Wang <nicklew@nvidia.com> [nicklela]\r
+R: Igor Kulchytskyy <igork@ami.com> [igorkulchytskyy]\r
 \r
 SecurityPkg\r
 F: SecurityPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/SecurityPkg\r
-M: Jiewen Yao <jiewen.yao@intel.com>\r
-M: Jian J Wang <jian.j.wang@intel.com>\r
-R: Chao Zhang <chao.b.zhang@intel.com>\r
+M: Jiewen Yao <jiewen.yao@intel.com> [jyao1]\r
+M: Jian J Wang <jian.j.wang@intel.com> [jwang36]\r
+\r
+SecurityPkg: Secure boot related modules\r
+F: SecurityPkg/Library/DxeImageVerificationLib/\r
+F: SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/\r
+F: SecurityPkg/Library/AuthVariableLib/\r
+R: Min Xu <min.m.xu@intel.com> [mxu9]\r
+\r
+SecurityPkg: Tcg related modules\r
+F: SecurityPkg/Tcg/\r
+R: Qi Zhang <qi1.zhang@intel.com> [qizhangz]\r
+R: Rahul Kumar <rahul1.kumar@intel.com> [rahul1-kumar]\r
 \r
 ShellPkg\r
 F: ShellPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg\r
-M: Ray Ni <ray.ni@intel.com>\r
-M: Zhichao Gao <zhichao.gao@intel.com>\r
+M: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+M: Zhichao Gao <zhichao.gao@intel.com> [ZhichaoGao]\r
 \r
 SignedCapsulePkg\r
 F: SignedCapsulePkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg\r
-M: Jiewen Yao <jiewen.yao@intel.com>\r
-M: Chao Zhang <chao.b.zhang@intel.com>\r
+M: Jian J Wang <jian.j.wang@intel.com> [jwang36]\r
 \r
 SourceLevelDebugPkg\r
 F: SourceLevelDebugPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/SourceLevelDebugPkg\r
-M: Hao A Wu <hao.a.wu@intel.com>\r
+M: Hao A Wu <hao.a.wu@intel.com> [hwu25]\r
+\r
+StandaloneMmPkg\r
+F: StandaloneMmPkg/\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+M: Sami Mujawar <sami.mujawar@arm.com> [samimujawar]\r
+M: Jiewen Yao <jiewen.yao@intel.com> [jyao1]\r
+R: Supreeth Venkatesh <supreeth.venkatesh@arm.com> [supven01]\r
 \r
 UefiCpuPkg\r
 F: UefiCpuPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/UefiCpuPkg\r
-M: Eric Dong <eric.dong@intel.com>\r
-M: Ray Ni <ray.ni@intel.com>\r
-R: Laszlo Ersek <lersek@redhat.com>\r
+M: Eric Dong <eric.dong@intel.com> [ydong10]\r
+M: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+R: Rahul Kumar <rahul1.kumar@intel.com> [rahul1-kumar]\r
+R: Gerd Hoffmann <kraxel@redhat.com> [kraxel]\r
+\r
+UefiCpuPkg: Sec related modules\r
+F: UefiCpuPkg/SecCore/\r
+F: UefiCpuPkg/ResetVector/\r
+R: Debkumar De <debkumar.de@intel.com> [dde01]\r
+R: Catharine West <catharine.west@intel.com> [catharine-intl]\r
 \r
 UefiPayloadPkg\r
 F: UefiPayloadPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/UefiPayloadPkg\r
-M: Maurice Ma <maurice.ma@intel.com>\r
-M: Guo Dong <guo.dong@intel.com>\r
-M: Benjamin You <benjamin.you@intel.com>\r
+M: Guo Dong <guo.dong@intel.com> [gdong1]\r
+M: Ray Ni <ray.ni@intel.com> [niruiyu]\r
+M: Sean Rhodes <sean@starlabs.systems> [Sean-StarLabs]\r
+M: James Lu <james.lu@intel.com> [jameslu8]\r
+R: Gua Guo <gua.guo@intel.com> [gguo11837463]\r
 S: Maintained\r
 \r
-StandaloneMmPkg\r
-F: StandaloneMmPkg/\r
-M: Achin Gupta <achin.gupta@arm.com>\r
-M: Jiewen Yao <jiewen.yao@intel.com>\r
-R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>\r
+UnitTestFrameworkPkg\r
+F: UnitTestFrameworkPkg/\r
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]\r
+R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+S: Maintained\r