Re: [edk2-devel] [Patch 3/3] Maintainers.txt: Add GitHub IDs

["Michael D Kinney" <michael.d.kinney@intel.com>]

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Thursday, July 8, 2021 12:47 AM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm <leif@nuviainc.com>
> Subject: Re: [edk2-devel] [Patch 3/3] Maintainers.txt: Add GitHub IDs
> 
> Hi Mike,
> 
> On 07/08/21 05:46, Michael D Kinney wrote:
> > Cc: Andrew Fish <afish@apple.com>
> > Cc: Laszlo Ersek <lersek@redhat.com>
> > Cc: Leif Lindholm <leif@nuviainc.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >  Maintainers.txt | 286 ++++++++++++++++++++++++------------------------
> >  1 file changed, 143 insertions(+), 143 deletions(-)
> >
> > diff --git a/Maintainers.txt b/Maintainers.txt
> > index f4e4c72d0628..86926df13be3 100644
> > --- a/Maintainers.txt
> > +++ b/Maintainers.txt
> > @@ -68,10 +68,10 @@ F: */
> >  Tianocore Stewards
> >  ------------------
> >  F: *
> > -M: Andrew Fish <afish@apple.com>
> > -M: Laszlo Ersek <lersek@redhat.com>
> > -M: Leif Lindholm <leif@nuviainc.com>
> > -M: Michael D Kinney <michael.d.kinney@intel.com>
> > +M: Andrew Fish <afish@apple.com> [ajfish]
> > +M: Laszlo Ersek <lersek@redhat.com> [lersek]
> > +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> > +M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> 
> This patch conflicts with my patch
> 
> [edk2-devel] [PATCH] Maintainers.txt: remove Laszlo Ersek's entries
> 
> can you please respin?

Yes.

Mike

> 
> Thanks!
> Laszlo
> 
> >
> >  Responsible Disclosure, Reporting Security Issues
> >  -------------------------------------------------
> > @@ -80,73 +80,73 @@ 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 <gaoliming@byosoft.com.cn>
> > +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@nuviainc.com>          (ARM/AArch64)
> > -M: Ard Biesheuvel <ardb+tianocore@kernel.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 <leif@nuviainc.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@nuviainc.com>
> > -M: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> > +M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> >
> >  RISCV64
> >  F: */RiscV64/
> > -M: Abner Chang <abner.chang@hpe.com>
> > +M: Abner Chang <abner.chang@hpe.com> [changab]
> >  R: Daniel Schaefer <daniel.schaefer@hpe.com>
> >
> >  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 <gaoliming@byosoft.com.cn>
> > +M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
> > +M: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]
> > +R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> > +R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> >
> >  .mergify/
> >  F: .mergify/
> > -M: Michael D Kinney <michael.d.kinney@intel.com>
> > -M: Liming Gao <gaoliming@byosoft.com.cn>
> > -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]
> > +R: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]
> >
> >  .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 <gaoliming@byosoft.com.cn>
> > +M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
> > +M: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]
> > +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@nuviainc.com>
> > -M: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> > +M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> >
> >  ArmPlatformPkg
> >  F: ArmPlatformPkg/
> >  W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
> > -M: Leif Lindholm <leif@nuviainc.com>
> > -M: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > +M: Leif Lindholm <leif@nuviainc.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 <ardb+tianocore@kernel.org>
> > -R: Leif Lindholm <leif@nuviainc.com>
> > -R: Sami Mujawar <sami.mujawar@arm.com>
> > +M: Laszlo Ersek <lersek@redhat.com> [lersek]
> > +M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> > +R: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> > +R: Sami Mujawar <sami.mujawar@arm.com> [samimujawar]
> >
> >  ArmVirtPkg: modules used on Xen
> >  F: ArmVirtPkg/ArmVirtXen.*
> > @@ -161,78 +161,78 @@ R: Julien Grall <julien@xen.org>
> >  BaseTools
> >  F: BaseTools/
> >  W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
> > -M: Bob Feng <bob.c.feng@intel.com>
> > -M: Liming Gao <gaoliming@byosoft.com.cn>
> > -R: Yuwei Chen <yuwei.chen@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: Jiewen Yao <jiewen.yao@intel.com>
> > -M: Jian J Wang <jian.j.wang@intel.com>
> > -R: Xiaoyu Lu <xiaoyux.lu@intel.com>
> > -R: Guomin Jiang <guomin.jiang@intel.com>
> > +M: Jiewen Yao <jiewen.yao@intel.com> [jyao1]
> > +M: Jian J Wang <jian.j.wang@intel.com> [jwang36]
> > +R: Xiaoyu Lu <xiaoyux.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]
> >
> >  EmbeddedPkg
> >  F: EmbeddedPkg/
> >  W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
> > -M: Leif Lindholm <leif@nuviainc.com>
> > -M: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> > +M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> >
> >  EmulatorPkg
> >  F: EmulatorPkg/
> >  W: https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
> > -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
> >
> >  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 <gaoliming@byosoft.com.cn>
> > -M: Michael D Kinney <michael.d.kinney@intel.com>
> > -R: Guomin Jiang <guomin.jiang@intel.com>
> > -R: Wei6 Xu <wei6.xu@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]
> > +R: 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]
> > +R: 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: Hao A Wu <hao.a.wu@intel.com> [hwu25]
> >
> >  MdeModulePkg: ACPI modules
> >  F: MdeModulePkg/Include/*Acpi*.h
> >  F: MdeModulePkg/Universal/Acpi/
> > -R: Zhiguang Liu <zhiguang.liu@intel.com>
> > -R: Dandan Bi <dandan.bi@intel.com>
> > -R: Liming Gao <gaoliming@byosoft.com.cn>
> > +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 modules related to S3
> >  F: MdeModulePkg/*LockBox*/
> > @@ -240,8 +240,8 @@ 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*/
> > @@ -251,8 +251,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*/
> > @@ -266,8 +266,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*/
> > @@ -293,8 +293,8 @@ 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 <gaoliming@byosoft.com.cn>
> > +R: Dandan Bi <dandan.bi@intel.com> [dandanbi]
> > +R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> >
> >  MdeModulePkg: Device and Peripheral modules
> >  F: MdeModulePkg/*PciHostBridge*/
> > @@ -313,14 +313,14 @@ F: MdeModulePkg/Include/Ppi/StorageSecurityCommand.h
> >  F: MdeModulePkg/Include/Protocol/Ps2Policy.h
> >  F: MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/
> >  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>
> > -R: Ray Ni <ray.ni@intel.com>
> > -R: Zhichao Gao <zhichao.gao@intel.com>
> > +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*/
> > @@ -332,9 +332,9 @@ 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 <gaoliming@byosoft.com.cn>
> > -R: Guomin Jiang <guomin.jiang@intel.com>
> > +R: Hao A Wu <hao.a.wu@intel.com> [hwu25]
> > +R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> > +R: Guomin Jiang <guomin.jiang@intel.com> [guominjia]
> >
> >  MdeModulePkg: HII and UI modules
> >  F: MdeModulePkg/*FileExplorer*/
> > @@ -350,44 +350,44 @@ 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: Eric Dong <eric.dong@intel.com> [ydong10]
> > +R: Ray Ni <ray.ni@intel.com> [niruiyu]
> >
> >  MdeModulePkg: Pei Core
> >  F: MdeModulePkg/Core/Pei/
> > -R: Dandan Bi <dandan.bi@intel.com>
> > -R: Liming Gao <gaoliming@byosoft.com.cn>
> > +R: Dandan Bi <dandan.bi@intel.com> [dandanbi]
> > +R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> >  R: Debkumar De <debkumar.de@intel.com>
> >  R: Harry Han <harry.han@intel.com>
> > -R: Catharine West <catharine.west@intel.com>
> > +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: Hao A Wu <hao.a.wu@intel.com>
> > -R: Ray Ni <ray.ni@intel.com>
> > -R: Zhichao Gao <zhichao.gao@intel.com>
> > +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: SMBIOS modules
> >  F: MdeModulePkg/Universal/Smbios*/
> > -R: Zhiguang Liu <zhiguang.liu@intel.com>
> > -R: Dandan Bi <dandan.bi@intel.com>
> > -R: Star Zeng <star.zeng@intel.com>
> > -R: Zhichao Gao <zhichao.gao@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*/
> > @@ -396,34 +396,34 @@ 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 <gaoliming@byosoft.com.cn>
> > +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>
> > -R: Ray Ni <ray.ni@intel.com>
> > +R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]
> > +R: Ray Ni <ray.ni@intel.com> [niruiyu]
> >
> >  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 <gaoliming@byosoft.com.cn>
> > -R: Zhiguang Liu <zhiguang.liu@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: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> > -R: Jiaxin Wu <jiaxin.wu@intel.com>
> > -R: Siyuan Fu <siyuan.fu@intel.com>
> > +M: Maciej Rabeda <maciej.rabeda@linux.intel.com> [mrabeda]
> > +R: Jiaxin Wu <jiaxin.wu@intel.com> [jiaxinwu]
> > +R: Siyuan Fu <siyuan.fu@intel.com> [sfu5]
> >
> >  OvmfPkg
> >  F: OvmfPkg/
> >  W: http://www.tianocore.org/ovmf/
> > -M: Laszlo Ersek <lersek@redhat.com>
> > -M: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > -R: Jordan Justen <jordan.l.justen@intel.com>
> > +M: Laszlo Ersek <lersek@redhat.com> [lersek]
> > +M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> > +R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]
> >  S: Maintained
> >
> >  OvmfPkg: bhyve-related modules
> > @@ -437,12 +437,12 @@ 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>
> > -R: Peter Grehan <grehan@freebsd.org>
> > +R: Rebecca Cran <rebecca@bsdio.com> [bcran]
> > +R: Peter Grehan <grehan@freebsd.org> [grehan-freebsd]
> >
> >  OvmfPkg: CSM modules
> >  F: OvmfPkg/Csm/
> > -R: David Woodhouse <dwmw2@infradead.org>
> > +R: David Woodhouse <dwmw2@infradead.org> [dwmw2]
> >
> >  OvmfPkg: Confidential Computing
> >  F: OvmfPkg/AmdSev/
> > @@ -456,12 +456,12 @@ F: OvmfPkg/Library/VmgExitLib/
> >  F: OvmfPkg/PlatformPei/AmdSev.c
> >  F: OvmfPkg/ResetVector/
> >  F: OvmfPkg/Sec/
> > -R: Brijesh Singh <brijesh.singh@amd.com>
> > +R: Brijesh Singh <brijesh.singh@amd.com> [codomania]
> >  R: Erdem Aktas <erdemaktas@google.com>
> > -R: James Bottomley <jejb@linux.ibm.com>
> > -R: Jiewen Yao <jiewen.yao@intel.com>
> > -R: Min Xu <min.m.xu@intel.com>
> > -R: Tom Lendacky <thomas.lendacky@amd.com>
> > +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]
> >
> >  OvmfPkg: LsiScsi driver
> >  F: OvmfPkg/LsiScsiDxe/
> > @@ -509,86 +509,86 @@ F: OvmfPkg/XenPlatformPei/
> >  F: OvmfPkg/XenPvBlkDxe/
> >  F: OvmfPkg/XenResetVector/
> >  F: OvmfPkg/XenTimerDxe/
> > -R: Anthony Perard <anthony.perard@citrix.com>
> > +R: Anthony Perard <anthony.perard@citrix.com> [sheep]
> >  R: Julien Grall <julien@xen.org>
> >
> >  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]
> >
> >  RedfishPkg: Redfish related modules
> >  F: RedfishPkg/
> > -M: Abner Chang <abner.chang@hpe.com>
> > -R: Nickle Wang <nickle.wang@hpe.com>
> > +M: Abner Chang <abner.chang@hpe.com> [changab]
> > +R: Nickle Wang <nickle.wang@hpe.com> [nicklela]
> >
> >  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>
> > +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>
> > +R: Min Xu <min.m.xu@intel.com> [mxu9]
> >
> >  SecurityPkg: Tcg related modules
> >  F: SecurityPkg/Tcg/
> > -R: Qi Zhang <qi1.zhang@intel.com>
> > -R: Rahul Kumar <rahul1.kumar@intel.com>
> > +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: Jian J Wang <jian.j.wang@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>
> > -M: Sami Mujawar <sami.mujawar@arm.com>
> > -M: Jiewen Yao <jiewen.yao@intel.com>
> > -R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> > +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>
> > -R: Rahul Kumar <rahul1.kumar@intel.com>
> > +M: Eric Dong <eric.dong@intel.com> [ydong10]
> > +M: Ray Ni <ray.ni@intel.com> [niruiyu]
> > +R: Laszlo Ersek <lersek@redhat.com> [lersek]
> > +R: Rahul Kumar <rahul1.kumar@intel.com> [rahul1-kumar]
> >
> >  UefiCpuPkg: Sec related modules
> >  F: UefiCpuPkg/SecCore/
> >  F: UefiCpuPkg/ResetVector/
> >  R: Debkumar De <debkumar.de@intel.com>
> >  R: Harry Han <harry.han@intel.com>
> > -R: Catharine West <catharine.west@intel.com>
> > +R: Catharine West <catharine.west@intel.com> [catharine-intl]
> >
> >  UefiPayloadPkg
> >  F: UefiPayloadPkg/
> >  W: https://github.com/tianocore/tianocore.github.io/wiki/UefiPayloadPkg
> > -M: Guo Dong <guo.dong@intel.com>
> > -M: Ray Ni <ray.ni@intel.com>
> > -R: Maurice Ma <maurice.ma@intel.com>
> > -R: Benjamin You <benjamin.you@intel.com>
> > +M: Guo Dong <guo.dong@intel.com> [gdong1]
> > +M: Ray Ni <ray.ni@intel.com> [niruiyu]
> > +R: Maurice Ma <maurice.ma@intel.com> [mauricema]
> > +M: Benjamin You <benjamin.you@intel.com> [BenjaminYou]
> >  S: Maintained
> >
> >  UnitTestFrameworkPkg
> >  F: UnitTestFrameworkPkg/
> > -M: Michael D Kinney <michael.d.kinney@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]
> > +R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
> > +R: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]
> >  S: Maintained
> >