X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Maintainers.txt;h=321bd394905297e96dfe00721cff46b7d371306d;hp=180ad35d09763bccbe7e5b2335ff21d0253a00f1;hb=HEAD;hpb=021eb1820e31874618cfda0785f7eae2f0ec7ba9

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