Maintainers.txt: Add GitHub IDs

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>
Reviewed-by: Andrew Fish <afish@apple.com>

diff --git a/Maintainers.txt b/Maintainers.txt
index e9dda5c5ca0cb9d5e72a88142f065cb4bc1772b9..575a80be5e89c8d08852d13d6cbcc6712c5449ff 100644 (file)
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -68,9 +68,9 @@ F: */
 Tianocore Stewards\r
 ------------------\r
 F: *\r
-M: Andrew Fish <afish@apple.com>\r
-M: Leif Lindholm <leif@nuviainc.com>\r
-M: Michael D Kinney <michael.d.kinney@intel.com>\r
+M: Andrew Fish <afish@apple.com> [ajfish]\r
+M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]\r
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
 \r
 Responsible Disclosure, Reporting Security Issues\r
 -------------------------------------------------\r
@@ -79,72 +79,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 <gaoliming@byosoft.com.cn>\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@nuviainc.com>          (ARM/AArch64)\r
-M: Ard Biesheuvel <ardb+tianocore@kernel.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 <leif@nuviainc.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@nuviainc.com>\r
-M: Ard Biesheuvel <ardb+tianocore@kernel.org>\r
+M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
 \r
 RISCV64\r
 F: */RiscV64/\r
-M: Abner Chang <abner.chang@hpe.com>\r
+M: Abner Chang <abner.chang@hpe.com> [changab]\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
+M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+M: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]\r
+R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]\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
+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: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]\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
+M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+M: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]\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@nuviainc.com>\r
-M: Ard Biesheuvel <ardb+tianocore@kernel.org>\r
+M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
 \r
 ArmPlatformPkg\r
 F: ArmPlatformPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg\r
-M: Leif Lindholm <leif@nuviainc.com>\r
-M: Ard Biesheuvel <ardb+tianocore@kernel.org>\r
+M: Leif Lindholm <leif@nuviainc.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: Ard Biesheuvel <ardb+tianocore@kernel.org>\r
-R: Leif Lindholm <leif@nuviainc.com>\r
-R: Sami Mujawar <sami.mujawar@arm.com>\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+R: Leif Lindholm <leif@nuviainc.com> [leiflindholm]\r
+R: Sami Mujawar <sami.mujawar@arm.com> [samimujawar]\r
 \r
 ArmVirtPkg: modules used on Xen\r
 F: ArmVirtPkg/ArmVirtXen.*\r
@@ -159,78 +159,78 @@ R: Julien Grall <julien@xen.org>
 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 <gaoliming@byosoft.com.cn>\r
-R: Yuwei Chen <yuwei.chen@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: 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
+M: Jiewen Yao <jiewen.yao@intel.com> [jyao1]\r
+M: Jian J Wang <jian.j.wang@intel.com> [jwang36]\r
+R: Xiaoyu Lu <xiaoyux.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
 EmbeddedPkg\r
 F: EmbeddedPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg\r
-M: Leif Lindholm <leif@nuviainc.com>\r
-M: Ard Biesheuvel <ardb+tianocore@kernel.org>\r
+M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
 \r
 EmulatorPkg\r
 F: EmulatorPkg/\r
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg\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
 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 <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
+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
+R: 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
+R: 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: Hao A Wu <hao.a.wu@intel.com> [hwu25]\r
 \r
 MdeModulePkg: ACPI modules\r
 F: MdeModulePkg/Include/*Acpi*.h\r
 F: MdeModulePkg/Universal/Acpi/\r
-R: Zhiguang Liu <zhiguang.liu@intel.com>\r
-R: Dandan Bi <dandan.bi@intel.com>\r
-R: Liming Gao <gaoliming@byosoft.com.cn>\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 modules related to S3\r
 F: MdeModulePkg/*LockBox*/\r
@@ -238,8 +238,8 @@ F: MdeModulePkg/Include/*BootScript*.h
 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
@@ -249,8 +249,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
@@ -264,8 +264,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
@@ -291,8 +291,8 @@ 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 <gaoliming@byosoft.com.cn>\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
@@ -311,14 +311,14 @@ F: MdeModulePkg/Include/Ppi/StorageSecurityCommand.h
 F: MdeModulePkg/Include/Protocol/Ps2Policy.h\r
 F: MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/\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>\r
-R: Ray Ni <ray.ni@intel.com>\r
-R: Zhichao Gao <zhichao.gao@intel.com>\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
@@ -330,9 +330,9 @@ 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 <gaoliming@byosoft.com.cn>\r
-R: Guomin Jiang <guomin.jiang@intel.com>\r
+R: Hao A Wu <hao.a.wu@intel.com> [hwu25]\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
@@ -348,44 +348,44 @@ 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: Eric Dong <eric.dong@intel.com> [ydong10]\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>\r
-R: Liming Gao <gaoliming@byosoft.com.cn>\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>\r
 R: Harry Han <harry.han@intel.com>\r
-R: Catharine West <catharine.west@intel.com>\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: 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: 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: SMBIOS modules\r
 F: MdeModulePkg/Universal/Smbios*/\r
-R: Zhiguang Liu <zhiguang.liu@intel.com>\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: 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
@@ -394,33 +394,33 @@ 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 <gaoliming@byosoft.com.cn>\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>\r
-R: Ray Ni <ray.ni@intel.com>\r
+R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]\r
+R: Ray Ni <ray.ni@intel.com> [niruiyu]\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 <gaoliming@byosoft.com.cn>\r
-R: Zhiguang Liu <zhiguang.liu@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: Maciej Rabeda <maciej.rabeda@linux.intel.com>\r
-R: 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: Jiaxin Wu <jiaxin.wu@intel.com> [jiaxinwu]\r
+R: Siyuan Fu <siyuan.fu@intel.com> [sfu5]\r
 \r
 OvmfPkg\r
 F: OvmfPkg/\r
 W: http://www.tianocore.org/ovmf/\r
-M: Ard Biesheuvel <ardb+tianocore@kernel.org>\r
-R: Jordan Justen <jordan.l.justen@intel.com>\r
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]\r
+R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]\r
 S: Maintained\r
 \r
 OvmfPkg: bhyve-related modules\r
@@ -434,12 +434,12 @@ F: OvmfPkg/Library/PciHostBridgeLibScan/
 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: Rebecca Cran <rebecca@bsdio.com> [bcran]\r
+R: Peter Grehan <grehan@freebsd.org> [grehan-freebsd]\r
 \r
 OvmfPkg: CSM modules\r
 F: OvmfPkg/Csm/\r
-R: David Woodhouse <dwmw2@infradead.org>\r
+R: David Woodhouse <dwmw2@infradead.org> [dwmw2]\r
 \r
 OvmfPkg: Confidential Computing\r
 F: OvmfPkg/AmdSev/\r
@@ -453,12 +453,12 @@ F: OvmfPkg/Library/VmgExitLib/
 F: OvmfPkg/PlatformPei/AmdSev.c\r
 F: OvmfPkg/ResetVector/\r
 F: OvmfPkg/Sec/\r
-R: Brijesh Singh <brijesh.singh@amd.com>\r
+R: Brijesh Singh <brijesh.singh@amd.com> [codomania]\r
 R: Erdem Aktas <erdemaktas@google.com>\r
-R: James Bottomley <jejb@linux.ibm.com>\r
-R: Jiewen Yao <jiewen.yao@intel.com>\r
-R: Min Xu <min.m.xu@intel.com>\r
-R: Tom Lendacky <thomas.lendacky@amd.com>\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
 OvmfPkg: LsiScsi driver\r
 F: OvmfPkg/LsiScsiDxe/\r
@@ -506,85 +506,85 @@ F: OvmfPkg/XenPlatformPei/
 F: OvmfPkg/XenPvBlkDxe/\r
 F: OvmfPkg/XenResetVector/\r
 F: OvmfPkg/XenTimerDxe/\r
-R: Anthony Perard <anthony.perard@citrix.com>\r
+R: Anthony Perard <anthony.perard@citrix.com> [sheep]\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
+M: Ray Ni <ray.ni@intel.com> [niruiyu]\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
+M: Abner Chang <abner.chang@hpe.com> [changab]\r
+R: Nickle Wang <nickle.wang@hpe.com> [nicklela]\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
+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>\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>\r
-R: Rahul Kumar <rahul1.kumar@intel.com>\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: Jian J Wang <jian.j.wang@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>\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
+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: Rahul Kumar <rahul1.kumar@intel.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
 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: 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: Guo Dong <guo.dong@intel.com>\r
-M: Ray Ni <ray.ni@intel.com>\r
-R: Maurice Ma <maurice.ma@intel.com>\r
-R: 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
+R: Maurice Ma <maurice.ma@intel.com> [mauricema]\r
+R: Benjamin You <benjamin.you@intel.com> [BenjaminYou]\r
 S: Maintained\r
 \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
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]\r
+R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]\r
+R: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]\r
 S: Maintained\r