]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Maintainers.txt
DynamicTablesPkg: SsdtSerialPortLibArm fix ECC error
[mirror_edk2.git] / Maintainers.txt
index 919baccc561e3bf15fbab2a70dde8cbf7e789350..7e4699639ad9f275c3c437e426fe5be47067d1d1 100644 (file)
@@ -70,7 +70,7 @@ Tianocore Stewards
 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: Leif Lindholm <leif@nuviainc.com>\r
 M: Michael D Kinney <michael.d.kinney@intel.com>\r
 \r
 Responsible Disclosure, Reporting Security Issues\r
@@ -80,36 +80,72 @@ 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>\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@nuviainc.com>          (ARM/AArch64)\r
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>    (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 <leif@nuviainc.com>\r
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>\r
+\r
+RISCV64\r
+F: */RiscV64/\r
+M: Abner Chang <abner.chang@hpe.com>\r
+R: Daniel Schaefer <daniel.schaefer@hpe.com>\r
+\r
+EDK II Continuous Integration:\r
+------------------------------\r
+.azurepipelines/\r
+F: .azurepipelines/\r
+M: Sean Brogan <sean.brogan@microsoft.com>\r
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>\r
+R: Michael D Kinney <michael.d.kinney@intel.com>\r
+R: Liming Gao <gaoliming@byosoft.com.cn>\r
+\r
+.mergify/\r
+F: .mergify/\r
+M: Michael D Kinney <michael.d.kinney@intel.com>\r
+M: Liming Gao <gaoliming@byosoft.com.cn>\r
+R: Sean Brogan <sean.brogan@microsoft.com>\r
+R: Bret Barkelew <Bret.Barkelew@microsoft.com>\r
+\r
+.pytool/\r
+F: .pytool/\r
+M: Sean Brogan <sean.brogan@microsoft.com>\r
+M: Bret Barkelew <Bret.Barkelew@microsoft.com>\r
+R: Michael D Kinney <michael.d.kinney@intel.com>\r
+R: Liming Gao <gaoliming@byosoft.com.cn>\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 <leif@nuviainc.com>\r
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>\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 <leif@nuviainc.com>\r
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>\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 <ard.biesheuvel@arm.com>\r
+R: Leif Lindholm <leif@nuviainc.com>\r
 \r
 ArmVirtPkg: modules used on Xen\r
 F: ArmVirtPkg/ArmVirtXen.*\r
@@ -119,19 +155,32 @@ F: ArmVirtPkg/PrePi/
 F: ArmVirtPkg/XenAcpiPlatformDxe/\r
 F: ArmVirtPkg/XenPlatformHasAcpiDtDxe/\r
 F: ArmVirtPkg/XenioFdtDxe/\r
-R: Julien Grall <julien.grall@arm.com>\r
+R: Julien Grall <julien@xen.org>\r
+\r
+ArmVirtPkg: Kvmtool emulated platform support\r
+F: ArmVirtPkg/ArmVirtKvmTool.*\r
+F: ArmVirtPkg/KvmtoolPlatformDxe/\r
+F: ArmVirtPkg/Library/Fdt16550SerialPortHookLib/\r
+F: ArmVirtPkg/Library/KvmtoolPlatformPeiLib/\r
+F: ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/\r
+F: ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/\r
+F: ArmVirtPkg/Library/NorFlashKvmtoolLib/\r
+R: Sami Mujawar <sami.mujawar@arm.com>\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: Liming Gao <gaoliming@byosoft.com.cn>\r
+R: Yuwei Chen <yuwei.chen@intel.com>\r
 \r
 CryptoPkg\r
 F: CryptoPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/CryptoPkg\r
-M: Jian Wang <jian.j.wang@intel.com>\r
-R: Ting Ye <ting.ye@intel.com>\r
+M: Jiewen Yao <jiewen.yao@intel.com>\r
+M: Jian J Wang <jian.j.wang@intel.com>\r
+R: Xiaoyu Lu <xiaoyux.lu@intel.com>\r
+R: Guomin Jiang <guomin.jiang@intel.com>\r
 \r
 DynamicTablesPkg\r
 F: DynamicTablesPkg/\r
@@ -142,8 +191,8 @@ M: Alexei Fedorov <Alexei.Fedorov@arm.com>
 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 <leif@nuviainc.com>\r
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>\r
 \r
 EmulatorPkg\r
 F: EmulatorPkg/\r
@@ -163,8 +212,10 @@ T: git - https://github.com/tianocore/edk2-FatPkg.git
 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: Liming Gao <gaoliming@byosoft.com.cn>\r
 M: Michael D Kinney <michael.d.kinney@intel.com>\r
+R: Guomin Jiang <guomin.jiang@intel.com>\r
+R: Wei6 Xu <wei6.xu@intel.com>\r
 \r
 IntelFsp2Pkg\r
 F: IntelFsp2Pkg/\r
@@ -190,9 +241,9 @@ MdeModulePkg: ACPI modules
 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: Liming Gao <gaoliming@byosoft.com.cn>\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
@@ -234,7 +285,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
@@ -253,18 +303,16 @@ F: MdeModulePkg/Universal/PCD/
 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: Liming Gao <gaoliming@byosoft.com.cn>\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
@@ -273,11 +321,16 @@ 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
+MdeModulePkg: Disk modules\r
+F: MdeModulePkg/Universal/Disk/\r
+R: Hao A Wu <hao.a.wu@intel.com>\r
+R: Ray Ni <ray.ni@intel.com>\r
+R: Zhichao Gao <zhichao.gao@intel.com>\r
+\r
 MdeModulePkg: Firmware Update modules\r
 F: MdeModulePkg/*Capsule*/\r
 F: MdeModulePkg/Include/*Capsule*.h\r
@@ -289,7 +342,8 @@ F: MdeModulePkg/Library/DisplayUpdateProgressLib*/
 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>\r
+R: Guomin Jiang <guomin.jiang@intel.com>\r
 \r
 MdeModulePkg: HII and UI modules\r
 F: MdeModulePkg/*FileExplorer*/\r
@@ -316,16 +370,32 @@ F: MdeModulePkg/Include/*Smm*.h
 R: Eric Dong <eric.dong@intel.com>\r
 R: Ray Ni <ray.ni@intel.com>\r
 \r
+MdeModulePkg: Pei Core\r
+F: MdeModulePkg/Core/Pei/\r
+R: Dandan Bi <dandan.bi@intel.com>\r
+R: Liming Gao <gaoliming@byosoft.com.cn>\r
+R: Debkumar De <debkumar.de@intel.com>\r
+R: Harry Han <harry.han@intel.com>\r
+R: Catharine West <catharine.west@intel.com>\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
+MdeModulePkg: Serial modules\r
+F: MdeModulePkg/*Serial*/\r
+F: MdeModulePkg/Include/*SerialPort*.h\r
+R: Hao A Wu <hao.a.wu@intel.com>\r
+R: Ray Ni <ray.ni@intel.com>\r
+R: Zhichao Gao <zhichao.gao@intel.com>\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: Zhichao Gao <zhichao.gao@intel.com>\r
 \r
 MdeModulePkg: UEFI Variable modules\r
 F: MdeModulePkg/*Var*/\r
@@ -335,28 +405,76 @@ F: MdeModulePkg/Include/Guid/SystemNvDataGuid.h
 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: Liming Gao <gaoliming@byosoft.com.cn>\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: Liming Gao <gaoliming@byosoft.com.cn>\r
+R: Zhiguang Liu <zhiguang.liu@intel.com>\r
 \r
 NetworkPkg\r
 F: NetworkPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg\r
-M: Siyuan Fu <siyuan.fu@intel.com>\r
-M: Jiaxin Wu <jiaxin.wu@intel.com>\r
+M: Maciej Rabeda <maciej.rabeda@linux.intel.com>\r
+R: Jiaxin Wu <jiaxin.wu@intel.com>\r
+R: Siyuan Fu <siyuan.fu@intel.com>\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 <ard.biesheuvel@arm.com>\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/PlatformBootManagerLibBhyve/\r
+F: OvmfPkg/Library/ResetSystemLib/BaseResetShutdownBhyve.c\r
+F: OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibBhyve.inf\r
+R: Rebecca Cran <rebecca@bsdio.com>\r
+R: Peter Grehan <grehan@freebsd.org>\r
+\r
+OvmfPkg: CSM modules\r
+F: OvmfPkg/Csm/\r
+R: David Woodhouse <dwmw2@infradead.org>\r
+\r
+OvmfPkg: LsiScsi driver\r
+F: OvmfPkg/LsiScsiDxe/\r
+R: Gary Lin <glin@suse.com>\r
+\r
+OvmfPkg: MptScsi and PVSCSI driver\r
+F: OvmfPkg/MptScsiDxe/\r
+F: OvmfPkg/PvScsiDxe/\r
+R: Liran Alon <liran.alon@oracle.com>\r
+R: Nikita Leshenko <nikita.leshchenko@oracle.com>\r
+\r
+OvmfPkg: SEV-related modules\r
+F: OvmfPkg/AmdSevDxe/\r
+F: OvmfPkg/Include/Library/MemEncryptSevLib.h\r
+F: OvmfPkg/IoMmuDxe/AmdSevIoMmu.*\r
+F: OvmfPkg/Library/BaseMemEncryptSevLib/\r
+F: OvmfPkg/Library/VmgExitLib/\r
+F: OvmfPkg/PlatformPei/AmdSev.c\r
+R: Tom Lendacky <thomas.lendacky@amd.com>\r
+R: Brijesh Singh <brijesh.singh@amd.com>\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: Xen-related modules\r
 F: OvmfPkg/AcpiPlatformDxe/Xen.c\r
 F: OvmfPkg/Include/Guid/XenBusRootDevice.h\r
@@ -388,64 +506,72 @@ F: OvmfPkg/XenPvBlkDxe/
 F: OvmfPkg/XenResetVector/\r
 F: OvmfPkg/XenTimerDxe/\r
 R: Anthony Perard <anthony.perard@citrix.com>\r
-R: Julien Grall <julien.grall@arm.com>\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
+R: Julien Grall <julien@xen.org>\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
 \r
+RedfishPkg: Redfish related modules\r
+F: RedfishPkg/\r
+M: Abner Chang <abner.chang@hpe.com>\r
+R: Nickle Wang <nickle.wang@hpe.com>\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 Wang <jian.j.wang@intel.com>\r
-R: Chao Zhang <chao.b.zhang@intel.com>\r
+M: Jian J Wang <jian.j.wang@intel.com>\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>\r
+\r
+SecurityPkg: Tcg related modules\r
+F: SecurityPkg/Tcg/\r
+R: Qi Zhang <qi1.zhang@intel.com>\r
+R: Rahul Kumar <rahul1.kumar@intel.com>\r
 \r
 ShellPkg\r
 F: ShellPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg\r
-M: Jaben Carsey <jaben.carsey@intel.com>\r
 M: Ray Ni <ray.ni@intel.com>\r
-R: Zhichao Gao <zhichao.gao@intel.com>\r
-\r
-Maintainers for stable Shell binaries generation\r
-when need to publish Shell binaries with edk2 release:\r
-M: Jaben Carsey <jaben.carsey@intel.com>      (Ia32/X64)\r
-M: Ray Ni <ray.ni@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: Zhichao Gao <zhichao.gao@intel.com>\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>\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
 \r
+StandaloneMmPkg\r
+F: StandaloneMmPkg/\r
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>\r
+M: Sami Mujawar <sami.mujawar@arm.com>\r
+M: Jiewen Yao <jiewen.yao@intel.com>\r
+R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>\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
+R: Rahul Kumar <rahul1.kumar@intel.com>\r
+\r
+UefiCpuPkg: Sec related modules\r
+F: UefiCpuPkg/SecCore/\r
+F: UefiCpuPkg/ResetVector/\r
+R: Debkumar De <debkumar.de@intel.com>\r
+R: Harry Han <harry.han@intel.com>\r
+R: Catharine West <catharine.west@intel.com>\r
 \r
 UefiPayloadPkg\r
 F: UefiPayloadPkg/\r
@@ -455,8 +581,9 @@ M: Guo Dong <guo.dong@intel.com>
 M: Benjamin You <benjamin.you@intel.com>\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>\r
+R: Sean Brogan <sean.brogan@microsoft.com>\r
+R: Bret Barkelew <Bret.Barkelew@microsoft.com>\r
+S: Maintained\r