]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Maintainers.txt
CryptoPkg: Add Null instance of the TlsLib class
[mirror_edk2.git] / Maintainers.txt
index 2d3a792c306eebc372c87f89c16d8779e4697f32..6b89bec55e2e60ffdd3de0f3441274b93118b76f 100644 (file)
@@ -1,4 +1,4 @@
-EDK II Maintainers\r
+EDK II Maintainers\r
 ==================\r
 \r
 This file provides information about the primary maintainers for\r
@@ -36,17 +36,38 @@ Descriptions of section entries:
      Obsolete:   Old code. Something tagged obsolete generally means\r
                  it has been replaced by a better system and you\r
                  should be using that.\r
+  F: Files and directories with wildcard patterns.\r
+     A trailing slash includes all files and subdirectory files.\r
+     F:   MdeModulePkg/   all files in and below MdeModulePkg\r
+     F:   MdeModulePkg/*  all files in MdeModulePkg, but not below\r
+     F:   */Pci/*         all files in a directory called Pci, at any depth in\r
+                          the hierarchy, but not below\r
+     One pattern per line.  Multiple F: lines per section acceptable.\r
+  X: Files and directories that are NOT maintained, same rules as F:\r
+     Files exclusions are tested after file matches.\r
+     Can be useful for excluding a specific subdirectory, for instance:\r
+     F:   NetworkPkg/\r
+     X:   NetworkPkg/Ip6Dxe/\r
+     matches all files in and below NetworkPkg excluding NetworkPkg/Ip6Dxe/\r
+  Filenames not caught by any F: rule get matched as being located in the top-\r
+  level directory. (Internally, the script looks for a match called '<default>',\r
+  so please don't add a file called that in the top-level directory.)\r
 \r
 EDK II\r
 ------\r
 W: http://www.tianocore.org/edk2/\r
-L: https://lists.01.org/mailman/listinfo/edk2-devel\r
+L: https://edk2.groups.io/g/devel/\r
 T: git - https://github.com/tianocore/edk2.git\r
 T: git (mirror) - https://bitbucket.org/tianocore/edk2.git\r
-T: svn (read-only, deprecated) - https://svn.code.sf.net/p/edk2/code/trunk/edk2\r
+\r
+All patches CC:d here\r
+L: devel@edk2.groups.io\r
+F: *\r
+F: */\r
 \r
 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
@@ -61,54 +82,79 @@ EDK II Releases:
 W: https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Release-Planning\r
 M: Liming Gao <liming.gao@intel.com>\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
+\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
+\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
 \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
 \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
+\r
+ArmVirtPkg: modules used on Xen\r
+F: ArmVirtPkg/ArmVirtXen.*\r
+F: ArmVirtPkg/Library/XenArmGenericTimerVirtCounterLib/\r
+F: ArmVirtPkg/Library/XenVirtMemInfoLib/\r
+F: ArmVirtPkg/PrePi/\r
+F: ArmVirtPkg/XenAcpiPlatformDxe/\r
+F: ArmVirtPkg/XenPlatformHasAcpiDtDxe/\r
+F: ArmVirtPkg/XenioFdtDxe/\r
 R: Julien Grall <julien.grall@arm.com>\r
-   (Xen modules)\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
-R: Yonghong Zhu <yonghong.zhu@intel.com>\r
-\r
-CorebootModulePkg, CorebootPayloadPkg\r
-W: https://github.com/tianocore/tianocore.github.io/wiki/Coreboot_UEFI_payload\r
-M: Maurice Ma <maurice.ma@intel.com>\r
-M: Prince Agyeman <prince.agyeman@intel.com>\r
-M: Benjamin You <benjamin.you@intel.com>\r
-S: Maintained\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: Jian Wang <jian.j.wang@intel.com>\r
+R: Xiaoyu Lu <xiaoyux.lu@intel.com>\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
 \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
 \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
@@ -116,129 +162,301 @@ M: Ray Ni <ray.ni@intel.com>
 S: Maintained\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
 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
 \r
-IntelFrameworkModulePkg\r
-W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFrameworkModulePkg\r
-M: Liming Gao <liming.gao@intel.com>\r
-\r
-IntelFrameworkPkg\r
-W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFrameworkPkg\r
-M: Michael D Kinney <michael.d.kinney@intel.com>\r
-M: Liming Gao <liming.gao@intel.com>\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
 \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
 \r
-IntelFspPkg\r
-W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFspPkg\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
-\r
-IntelFspWrapperPkg\r
-W: https://github.com/tianocore/tianocore.github.io/wiki/IntelFspWrapperPkg\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
-\r
-IntelSiliconPkg\r
-W: https://github.com/tianocore/tianocore.github.io/wiki/IntelSiliconPkg\r
-M: Ray Ni <ray.ni@intel.com>\r
-M: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>\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: NetworkPkg maintainers\r
-  (Universal/Network and related libraries, header files)\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
+MdeModulePkg: ACPI S3 modules\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
+MdeModulePkg: BDS modules\r
+F: MdeModulePkg/*BootManager*/\r
+F: MdeModulePkg/Include/Library/UefiBootManagerLib.h\r
+F: MdeModulePkg/Universal/BdsDxe/\r
+F: MdeModulePkg/Universal/DevicePathDxe/\r
+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
+MdeModulePkg: Console and Graphics modules\r
+F: MdeModulePkg/*Logo*/\r
+F: MdeModulePkg/Include/*Logo*.h\r
+F: MdeModulePkg/Include/Guid/ConnectConInEvent.h\r
+F: MdeModulePkg/Include/Guid/Console*.h\r
+F: MdeModulePkg/Include/Guid/StandardErrorDevice.h\r
+F: MdeModulePkg/Include/Guid/TtyTerm.h\r
+F: MdeModulePkg/Include/Library/BmpSupportLib.h\r
+F: MdeModulePkg/Include/Library/FrameBufferBltLib.h\r
+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
+MdeModulePkg: Core services (PEI, DXE and Runtime) modules\r
+F: MdeModulePkg/*Mem*/\r
+F: MdeModulePkg/*SectionExtract*/\r
+F: MdeModulePkg/*StatusCode*/\r
+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
+F: MdeModulePkg/Include/*Perf*.h\r
+F: MdeModulePkg/Include/*StatusCode*.h\r
+F: MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h\r
+F: MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h\r
+F: MdeModulePkg/Include/Guid/IdleLoopEvent.h\r
+F: MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h\r
+F: MdeModulePkg/Include/Guid/LzmaDecompress.h\r
+F: MdeModulePkg/Include/Library/SecurityManagementLib.h\r
+F: MdeModulePkg/Library/*Decompress*/\r
+F: MdeModulePkg/Library/*Perf*/\r
+F: MdeModulePkg/Library/DxeSecurityManagementLib/\r
+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
+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
+F: MdeModulePkg/Include/Guid/S3StorageDeviceInitList.h\r
+F: MdeModulePkg/Include/Library/PciHostBridgeLib.h\r
+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: Firmware Update modules\r
+F: MdeModulePkg/*Capsule*/\r
+F: MdeModulePkg/Include/*Capsule*.h\r
+F: MdeModulePkg/Include/Library/DisplayUpdateProgressLib.h\r
+F: MdeModulePkg/Include/Library/FmpAuthenticationLib.h\r
+F: MdeModulePkg/Include/Protocol/EsrtManagement.h\r
+F: MdeModulePkg/Include/Protocol/FirmwareManagementProgress.h\r
+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
+MdeModulePkg: HII and UI modules\r
+F: MdeModulePkg/*FileExplorer*/\r
+F: MdeModulePkg/*Hii*/\r
+F: MdeModulePkg/*Ui*/\r
+F: MdeModulePkg/Application/BootManagerMenuApp/\r
+F: MdeModulePkg/Include/*FileExplorer*.h\r
+F: MdeModulePkg/Include/*FormBrowser*.h\r
+F: MdeModulePkg/Include/*Hii*.h\r
+F: MdeModulePkg/Include/Library/CustomizedDisplayLib.h\r
+F: MdeModulePkg/Include/Protocol/DisplayProtocol.h\r
+F: MdeModulePkg/Library/CustomizedDisplayLib/\r
+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
+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
-  (especially for Bus, Universal/Console, Universal/Disk,\r
-   Universal/BdsDxe and related libraries, header files)\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: 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
+MdeModulePkg: UEFI Variable modules\r
+F: MdeModulePkg/*Var*/\r
+F: MdeModulePkg/Include/*/*FaultTolerantWrite*.h\r
+F: MdeModulePkg/Include/*/*Var*.h\r
+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
 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
 \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
 \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
+S: Maintained\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
+F: OvmfPkg/Include/Library/XenHypercallLib.h\r
+F: OvmfPkg/Include/Library/XenIoMmioLib.h\r
+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/PlatformBootManagerLib/BdsPlatform.c\r
+F: OvmfPkg/Library/XenConsoleSerialPortLib/\r
+F: OvmfPkg/Library/XenHypercallLib/\r
+F: OvmfPkg/Library/XenIoMmioLib/\r
+F: OvmfPkg/Library/XenPlatformLib/\r
+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/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
-   (Xen modules)\r
 R: Julien Grall <julien.grall@arm.com>\r
-   (Xen modules)\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
-   (TPM2 modules)\r
 R: Stefan Berger <stefanb@linux.ibm.com>\r
-   (TPM2 modules)\r
-S: Maintained\r
+\r
+OvmfPkg: CSM modules\r
+F: OvmfPkg/Csm/\r
+R: David Woodhouse <dwmw2@infradead.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
 SecurityPkg\r
+F: SecurityPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/SecurityPkg\r
-M: Chao Zhang <chao.b.zhang@intel.com>\r
 M: Jiewen Yao <jiewen.yao@intel.com>\r
-M: Jian Wang <jian.j.wang@intel.com>\r
+M: Jian J Wang <jian.j.wang@intel.com>\r
+R: Chao Zhang <chao.b.zhang@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
 \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
 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
+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
+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