[Patch V2 0/3] Add GitHub IDs to Maintainers.txt

[Patch V2 0/3] Add GitHub IDs to Maintainers.txt

[Michael D Kinney]

New in V2
=========
* Maintainers.txt updates
* Remove content after email address from standard output
* Fix --lookup compatibility with '\' path separators.

Update GetMaintainer.py to allow a GitHub ID after the email address
for maintainers and reviewers and update Maitainers.txt with GitHub IDs.

The GitHub ID will be used to help autotate the PR reviewer assignments.

Cc: Andrew Fish <afish@apple.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>

Michael D Kinney (3):
  BaseTools/Scripts: Fix GetMaintainer.py line endings
  BaseTools/Scripts: Allow GitHub ID at end Maintainers.txt lines
  Maintainers.txt: Add GitHub IDs

 BaseTools/Scripts/GetMaintainer.py | 382 +++++++++++++++--------------
 Maintainers.txt                    | 282 +++++++++++----------
 2 files changed, 331 insertions(+), 333 deletions(-)

-- 
2.32.0.windows.1

[Patch V2 1/3] BaseTools/Scripts: Fix GetMaintainer.py line endings

[Michael D Kinney]

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 BaseTools/Scripts/GetMaintainer.py | 380 ++++++++++++++---------------
 1 file changed, 190 insertions(+), 190 deletions(-)

diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMaintainer.py
index ed7bc7dc2b88..5ec851554d64 100644
--- a/BaseTools/Scripts/GetMaintainer.py
+++ b/BaseTools/Scripts/GetMaintainer.py
@@ -1,194 +1,194 @@
-## @file
-#  Retrieves the people to request review from on submission of a commit.
-#
-#  Copyright (c) 2019, Linaro Ltd. All rights reserved.<BR>
-#
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-
-from __future__ import print_function
-from collections import defaultdict
-from collections import OrderedDict
-import argparse
-import os
-import re
-import SetupGit
-
-EXPRESSIONS = {
-    'exclude':    re.compile(r'^X:\s*(?P<exclude>.*?)\r*$'),
-    'file':       re.compile(r'^F:\s*(?P<file>.*?)\r*$'),
-    'list':       re.compile(r'^L:\s*(?P<list>.*?)\r*$'),
-    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*<.*?>)\r*$'),
-    'reviewer':   re.compile(r'^R:\s*(?P<reviewer>.*?)\r*$'),
-    'status':     re.compile(r'^S:\s*(?P<status>.*?)\r*$'),
-    'tree':       re.compile(r'^T:\s*(?P<tree>.*?)\r*$'),
-    'webpage':    re.compile(r'^W:\s*(?P<webpage>.*?)\r*$')
-}
-
-def printsection(section):
-    """Prints out the dictionary describing a Maintainers.txt section."""
-    print('===')
-    for key in section.keys():
-        print("Key: %s" % key)
-        for item in section[key]:
-            print('  %s' % item)
-
-def pattern_to_regex(pattern):
-    """Takes a string containing regular UNIX path wildcards
-       and returns a string suitable for matching with regex."""
-
-    pattern = pattern.replace('.', r'\.')
-    pattern = pattern.replace('?', r'.')
-    pattern = pattern.replace('*', r'.*')
-
-    if pattern.endswith('/'):
-        pattern += r'.*'
-    elif pattern.endswith('.*'):
-        pattern = pattern[:-2]
-        pattern += r'(?!.*?/.*?)'
-
-    return pattern
-
-def path_in_section(path, section):
-    """Returns True of False indicating whether the path is covered by
-       the current section."""
-    if not 'file' in section:
-        return False
-
-    for pattern in section['file']:
-        regex = pattern_to_regex(pattern)
-
-        match = re.match(regex, path)
-        if match:
-            # Check if there is an exclude pattern that applies
-            for pattern in section['exclude']:
-                regex = pattern_to_regex(pattern)
-
-                match = re.match(regex, path)
-                if match:
-                    return False
-
-            return True
-
-    return False
-
-def get_section_maintainers(path, section):
-    """Returns a list with email addresses to any M: and R: entries
-       matching the provided path in the provided section."""
-    maintainers = []
-    lists = []
+## @file
+#  Retrieves the people to request review from on submission of a commit.
+#
+#  Copyright (c) 2019, Linaro Ltd. All rights reserved.<BR>
+#
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+
+from __future__ import print_function
+from collections import defaultdict
+from collections import OrderedDict
+import argparse
+import os
+import re
+import SetupGit
+
+EXPRESSIONS = {
+    'exclude':    re.compile(r'^X:\s*(?P<exclude>.*?)\r*$'),
+    'file':       re.compile(r'^F:\s*(?P<file>.*?)\r*$'),
+    'list':       re.compile(r'^L:\s*(?P<list>.*?)\r*$'),
+    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*<.*?>)\r*$'),
+    'reviewer':   re.compile(r'^R:\s*(?P<reviewer>.*?)\r*$'),
+    'status':     re.compile(r'^S:\s*(?P<status>.*?)\r*$'),
+    'tree':       re.compile(r'^T:\s*(?P<tree>.*?)\r*$'),
+    'webpage':    re.compile(r'^W:\s*(?P<webpage>.*?)\r*$')
+}
+
+def printsection(section):
+    """Prints out the dictionary describing a Maintainers.txt section."""
+    print('===')
+    for key in section.keys():
+        print("Key: %s" % key)
+        for item in section[key]:
+            print('  %s' % item)
+
+def pattern_to_regex(pattern):
+    """Takes a string containing regular UNIX path wildcards
+       and returns a string suitable for matching with regex."""
+
+    pattern = pattern.replace('.', r'\.')
+    pattern = pattern.replace('?', r'.')
+    pattern = pattern.replace('*', r'.*')
+
+    if pattern.endswith('/'):
+        pattern += r'.*'
+    elif pattern.endswith('.*'):
+        pattern = pattern[:-2]
+        pattern += r'(?!.*?/.*?)'
+
+    return pattern
+
+def path_in_section(path, section):
+    """Returns True of False indicating whether the path is covered by
+       the current section."""
+    if not 'file' in section:
+        return False
+
+    for pattern in section['file']:
+        regex = pattern_to_regex(pattern)
+
+        match = re.match(regex, path)
+        if match:
+            # Check if there is an exclude pattern that applies
+            for pattern in section['exclude']:
+                regex = pattern_to_regex(pattern)
+
+                match = re.match(regex, path)
+                if match:
+                    return False
+
+            return True
+
+    return False
+
+def get_section_maintainers(path, section):
+    """Returns a list with email addresses to any M: and R: entries
+       matching the provided path in the provided section."""
+    maintainers = []
+    lists = []
     nowarn_status = ['Supported', 'Maintained']
-
-    if path_in_section(path, section):
+
+    if path_in_section(path, section):
         for status in section['status']:
             if status not in nowarn_status:
                 print('WARNING: Maintained status for "%s" is \'%s\'!' % (path, status))
-        for address in section['maintainer'], section['reviewer']:
-            # Convert to list if necessary
-            if isinstance(address, list):
-                maintainers += address
-            else:
-                lists += [address]
-        for address in section['list']:
-            # Convert to list if necessary
-            if isinstance(address, list):
-                lists += address
-            else:
-                lists += [address]
-
-    return maintainers, lists
-
-def get_maintainers(path, sections, level=0):
-    """For 'path', iterates over all sections, returning maintainers
-       for matching ones."""
-    maintainers = []
-    lists = []
-    for section in sections:
-        tmp_maint, tmp_lists = get_section_maintainers(path, section)
-        if tmp_maint:
-            maintainers += tmp_maint
-        if tmp_lists:
-            lists += tmp_lists
-
-    if not maintainers:
-        # If no match found, look for match for (nonexistent) file
-        # REPO.working_dir/<default>
-        print('"%s": no maintainers found, looking for default' % path)
-        if level == 0:
-            maintainers = get_maintainers('<default>', sections, level=level + 1)
-        else:
-            print("No <default> maintainers set for project.")
-        if not maintainers:
-            return None
-
-    return maintainers + lists
-
-def parse_maintainers_line(line):
-    """Parse one line of Maintainers.txt, returning any match group and its key."""
-    for key, expression in EXPRESSIONS.items():
-        match = expression.match(line)
-        if match:
-            return key, match.group(key)
-    return None, None
-
-def parse_maintainers_file(filename):
-    """Parse the Maintainers.txt from top-level of repo and
-       return a list containing dictionaries of all sections."""
-    with open(filename, 'r') as text:
-        line = text.readline()
-        sectionlist = []
-        section = defaultdict(list)
-        while line:
-            key, value = parse_maintainers_line(line)
-            if key and value:
-                section[key].append(value)
-
-            line = text.readline()
-            # If end of section (end of file, or non-tag line encountered)...
-            if not key or not value or not line:
-                # ...if non-empty, append section to list.
-                if section:
-                    sectionlist.append(section.copy())
-                    section.clear()
-
-        return sectionlist
-
-def get_modified_files(repo, args):
-    """Returns a list of the files modified by the commit specified in 'args'."""
-    commit = repo.commit(args.commit)
-    return commit.stats.files
-
-if __name__ == '__main__':
-    PARSER = argparse.ArgumentParser(
-        description='Retrieves information on who to cc for review on a given commit')
-    PARSER.add_argument('commit',
-                        action="store",
-                        help='git revision to examine (default: HEAD)',
-                        nargs='?',
-                        default='HEAD')
-    PARSER.add_argument('-l', '--lookup',
-                        help='Find section matches for path LOOKUP',
-                        required=False)
-    ARGS = PARSER.parse_args()
-
-    REPO = SetupGit.locate_repo()
-
-    CONFIG_FILE = os.path.join(REPO.working_dir, 'Maintainers.txt')
-
-    SECTIONS = parse_maintainers_file(CONFIG_FILE)
-
-    if ARGS.lookup:
-        FILES = [ARGS.lookup]
-    else:
-        FILES = get_modified_files(REPO, ARGS)
-
-    ADDRESSES = []
-
-    for file in FILES:
-        print(file)
-        addresslist = get_maintainers(file, SECTIONS)
-        if addresslist:
-            ADDRESSES += addresslist
-
-    for address in list(OrderedDict.fromkeys(ADDRESSES)):
-        print('  %s' % address)
+        for address in section['maintainer'], section['reviewer']:
+            # Convert to list if necessary
+            if isinstance(address, list):
+                maintainers += address
+            else:
+                lists += [address]
+        for address in section['list']:
+            # Convert to list if necessary
+            if isinstance(address, list):
+                lists += address
+            else:
+                lists += [address]
+
+    return maintainers, lists
+
+def get_maintainers(path, sections, level=0):
+    """For 'path', iterates over all sections, returning maintainers
+       for matching ones."""
+    maintainers = []
+    lists = []
+    for section in sections:
+        tmp_maint, tmp_lists = get_section_maintainers(path, section)
+        if tmp_maint:
+            maintainers += tmp_maint
+        if tmp_lists:
+            lists += tmp_lists
+
+    if not maintainers:
+        # If no match found, look for match for (nonexistent) file
+        # REPO.working_dir/<default>
+        print('"%s": no maintainers found, looking for default' % path)
+        if level == 0:
+            maintainers = get_maintainers('<default>', sections, level=level + 1)
+        else:
+            print("No <default> maintainers set for project.")
+        if not maintainers:
+            return None
+
+    return maintainers + lists
+
+def parse_maintainers_line(line):
+    """Parse one line of Maintainers.txt, returning any match group and its key."""
+    for key, expression in EXPRESSIONS.items():
+        match = expression.match(line)
+        if match:
+            return key, match.group(key)
+    return None, None
+
+def parse_maintainers_file(filename):
+    """Parse the Maintainers.txt from top-level of repo and
+       return a list containing dictionaries of all sections."""
+    with open(filename, 'r') as text:
+        line = text.readline()
+        sectionlist = []
+        section = defaultdict(list)
+        while line:
+            key, value = parse_maintainers_line(line)
+            if key and value:
+                section[key].append(value)
+
+            line = text.readline()
+            # If end of section (end of file, or non-tag line encountered)...
+            if not key or not value or not line:
+                # ...if non-empty, append section to list.
+                if section:
+                    sectionlist.append(section.copy())
+                    section.clear()
+
+        return sectionlist
+
+def get_modified_files(repo, args):
+    """Returns a list of the files modified by the commit specified in 'args'."""
+    commit = repo.commit(args.commit)
+    return commit.stats.files
+
+if __name__ == '__main__':
+    PARSER = argparse.ArgumentParser(
+        description='Retrieves information on who to cc for review on a given commit')
+    PARSER.add_argument('commit',
+                        action="store",
+                        help='git revision to examine (default: HEAD)',
+                        nargs='?',
+                        default='HEAD')
+    PARSER.add_argument('-l', '--lookup',
+                        help='Find section matches for path LOOKUP',
+                        required=False)
+    ARGS = PARSER.parse_args()
+
+    REPO = SetupGit.locate_repo()
+
+    CONFIG_FILE = os.path.join(REPO.working_dir, 'Maintainers.txt')
+
+    SECTIONS = parse_maintainers_file(CONFIG_FILE)
+
+    if ARGS.lookup:
+        FILES = [ARGS.lookup]
+    else:
+        FILES = get_modified_files(REPO, ARGS)
+
+    ADDRESSES = []
+
+    for file in FILES:
+        print(file)
+        addresslist = get_maintainers(file, SECTIONS)
+        if addresslist:
+            ADDRESSES += addresslist
+
+    for address in list(OrderedDict.fromkeys(ADDRESSES)):
+        print('  %s' % address)
-- 
2.32.0.windows.1

Re: [Patch V2 1/3] BaseTools/Scripts: Fix GetMaintainer.py line endings

[Bob Feng]

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: Kinney, Michael D <michael.d.kinney@intel.com> 
Sent: Friday, July 9, 2021 3:51 AM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Subject: [Patch V2 1/3] BaseTools/Scripts: Fix GetMaintainer.py line endings

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 BaseTools/Scripts/GetMaintainer.py | 380 ++++++++++++++---------------
 1 file changed, 190 insertions(+), 190 deletions(-)

diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMaintainer.py
index ed7bc7dc2b88..5ec851554d64 100644
--- a/BaseTools/Scripts/GetMaintainer.py
+++ b/BaseTools/Scripts/GetMaintainer.py
@@ -1,194 +1,194 @@
-## @file
-#  Retrieves the people to request review from on submission of a commit.
-#
-#  Copyright (c) 2019, Linaro Ltd. All rights reserved.<BR> -# -#  SPDX-License-Identifier: BSD-2-Clause-Patent -#
-
-from __future__ import print_function
-from collections import defaultdict
-from collections import OrderedDict
-import argparse
-import os
-import re
-import SetupGit
-
-EXPRESSIONS = {
-    'exclude':    re.compile(r'^X:\s*(?P<exclude>.*?)\r*$'),
-    'file':       re.compile(r'^F:\s*(?P<file>.*?)\r*$'),
-    'list':       re.compile(r'^L:\s*(?P<list>.*?)\r*$'),
-    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*<.*?>)\r*$'),
-    'reviewer':   re.compile(r'^R:\s*(?P<reviewer>.*?)\r*$'),
-    'status':     re.compile(r'^S:\s*(?P<status>.*?)\r*$'),
-    'tree':       re.compile(r'^T:\s*(?P<tree>.*?)\r*$'),
-    'webpage':    re.compile(r'^W:\s*(?P<webpage>.*?)\r*$')
-}
-
-def printsection(section):
-    """Prints out the dictionary describing a Maintainers.txt section."""
-    print('===')
-    for key in section.keys():
-        print("Key: %s" % key)
-        for item in section[key]:
-            print('  %s' % item)
-
-def pattern_to_regex(pattern):
-    """Takes a string containing regular UNIX path wildcards
-       and returns a string suitable for matching with regex."""
-
-    pattern = pattern.replace('.', r'\.')
-    pattern = pattern.replace('?', r'.')
-    pattern = pattern.replace('*', r'.*')
-
-    if pattern.endswith('/'):
-        pattern += r'.*'
-    elif pattern.endswith('.*'):
-        pattern = pattern[:-2]
-        pattern += r'(?!.*?/.*?)'
-
-    return pattern
-
-def path_in_section(path, section):
-    """Returns True of False indicating whether the path is covered by
-       the current section."""
-    if not 'file' in section:
-        return False
-
-    for pattern in section['file']:
-        regex = pattern_to_regex(pattern)
-
-        match = re.match(regex, path)
-        if match:
-            # Check if there is an exclude pattern that applies
-            for pattern in section['exclude']:
-                regex = pattern_to_regex(pattern)
-
-                match = re.match(regex, path)
-                if match:
-                    return False
-
-            return True
-
-    return False
-
-def get_section_maintainers(path, section):
-    """Returns a list with email addresses to any M: and R: entries
-       matching the provided path in the provided section."""
-    maintainers = []
-    lists = []
+## @file
+#  Retrieves the people to request review from on submission of a commit.
+#
+#  Copyright (c) 2019, Linaro Ltd. All rights reserved.<BR> # #  
+SPDX-License-Identifier: BSD-2-Clause-Patent #
+
+from __future__ import print_function
+from collections import defaultdict
+from collections import OrderedDict
+import argparse
+import os
+import re
+import SetupGit
+
+EXPRESSIONS = {
+    'exclude':    re.compile(r'^X:\s*(?P<exclude>.*?)\r*$'),
+    'file':       re.compile(r'^F:\s*(?P<file>.*?)\r*$'),
+    'list':       re.compile(r'^L:\s*(?P<list>.*?)\r*$'),
+    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*<.*?>)\r*$'),
+    'reviewer':   re.compile(r'^R:\s*(?P<reviewer>.*?)\r*$'),
+    'status':     re.compile(r'^S:\s*(?P<status>.*?)\r*$'),
+    'tree':       re.compile(r'^T:\s*(?P<tree>.*?)\r*$'),
+    'webpage':    re.compile(r'^W:\s*(?P<webpage>.*?)\r*$')
+}
+
+def printsection(section):
+    """Prints out the dictionary describing a Maintainers.txt section."""
+    print('===')
+    for key in section.keys():
+        print("Key: %s" % key)
+        for item in section[key]:
+            print('  %s' % item)
+
+def pattern_to_regex(pattern):
+    """Takes a string containing regular UNIX path wildcards
+       and returns a string suitable for matching with regex."""
+
+    pattern = pattern.replace('.', r'\.')
+    pattern = pattern.replace('?', r'.')
+    pattern = pattern.replace('*', r'.*')
+
+    if pattern.endswith('/'):
+        pattern += r'.*'
+    elif pattern.endswith('.*'):
+        pattern = pattern[:-2]
+        pattern += r'(?!.*?/.*?)'
+
+    return pattern
+
+def path_in_section(path, section):
+    """Returns True of False indicating whether the path is covered by
+       the current section."""
+    if not 'file' in section:
+        return False
+
+    for pattern in section['file']:
+        regex = pattern_to_regex(pattern)
+
+        match = re.match(regex, path)
+        if match:
+            # Check if there is an exclude pattern that applies
+            for pattern in section['exclude']:
+                regex = pattern_to_regex(pattern)
+
+                match = re.match(regex, path)
+                if match:
+                    return False
+
+            return True
+
+    return False
+
+def get_section_maintainers(path, section):
+    """Returns a list with email addresses to any M: and R: entries
+       matching the provided path in the provided section."""
+    maintainers = []
+    lists = []
     nowarn_status = ['Supported', 'Maintained']
-
-    if path_in_section(path, section):
+
+    if path_in_section(path, section):
         for status in section['status']:
             if status not in nowarn_status:
                 print('WARNING: Maintained status for "%s" is \'%s\'!' % (path, status))
-        for address in section['maintainer'], section['reviewer']:
-            # Convert to list if necessary
-            if isinstance(address, list):
-                maintainers += address
-            else:
-                lists += [address]
-        for address in section['list']:
-            # Convert to list if necessary
-            if isinstance(address, list):
-                lists += address
-            else:
-                lists += [address]
-
-    return maintainers, lists
-
-def get_maintainers(path, sections, level=0):
-    """For 'path', iterates over all sections, returning maintainers
-       for matching ones."""
-    maintainers = []
-    lists = []
-    for section in sections:
-        tmp_maint, tmp_lists = get_section_maintainers(path, section)
-        if tmp_maint:
-            maintainers += tmp_maint
-        if tmp_lists:
-            lists += tmp_lists
-
-    if not maintainers:
-        # If no match found, look for match for (nonexistent) file
-        # REPO.working_dir/<default>
-        print('"%s": no maintainers found, looking for default' % path)
-        if level == 0:
-            maintainers = get_maintainers('<default>', sections, level=level + 1)
-        else:
-            print("No <default> maintainers set for project.")
-        if not maintainers:
-            return None
-
-    return maintainers + lists
-
-def parse_maintainers_line(line):
-    """Parse one line of Maintainers.txt, returning any match group and its key."""
-    for key, expression in EXPRESSIONS.items():
-        match = expression.match(line)
-        if match:
-            return key, match.group(key)
-    return None, None
-
-def parse_maintainers_file(filename):
-    """Parse the Maintainers.txt from top-level of repo and
-       return a list containing dictionaries of all sections."""
-    with open(filename, 'r') as text:
-        line = text.readline()
-        sectionlist = []
-        section = defaultdict(list)
-        while line:
-            key, value = parse_maintainers_line(line)
-            if key and value:
-                section[key].append(value)
-
-            line = text.readline()
-            # If end of section (end of file, or non-tag line encountered)...
-            if not key or not value or not line:
-                # ...if non-empty, append section to list.
-                if section:
-                    sectionlist.append(section.copy())
-                    section.clear()
-
-        return sectionlist
-
-def get_modified_files(repo, args):
-    """Returns a list of the files modified by the commit specified in 'args'."""
-    commit = repo.commit(args.commit)
-    return commit.stats.files
-
-if __name__ == '__main__':
-    PARSER = argparse.ArgumentParser(
-        description='Retrieves information on who to cc for review on a given commit')
-    PARSER.add_argument('commit',
-                        action="store",
-                        help='git revision to examine (default: HEAD)',
-                        nargs='?',
-                        default='HEAD')
-    PARSER.add_argument('-l', '--lookup',
-                        help='Find section matches for path LOOKUP',
-                        required=False)
-    ARGS = PARSER.parse_args()
-
-    REPO = SetupGit.locate_repo()
-
-    CONFIG_FILE = os.path.join(REPO.working_dir, 'Maintainers.txt')
-
-    SECTIONS = parse_maintainers_file(CONFIG_FILE)
-
-    if ARGS.lookup:
-        FILES = [ARGS.lookup]
-    else:
-        FILES = get_modified_files(REPO, ARGS)
-
-    ADDRESSES = []
-
-    for file in FILES:
-        print(file)
-        addresslist = get_maintainers(file, SECTIONS)
-        if addresslist:
-            ADDRESSES += addresslist
-
-    for address in list(OrderedDict.fromkeys(ADDRESSES)):
-        print('  %s' % address)
+        for address in section['maintainer'], section['reviewer']:
+            # Convert to list if necessary
+            if isinstance(address, list):
+                maintainers += address
+            else:
+                lists += [address]
+        for address in section['list']:
+            # Convert to list if necessary
+            if isinstance(address, list):
+                lists += address
+            else:
+                lists += [address]
+
+    return maintainers, lists
+
+def get_maintainers(path, sections, level=0):
+    """For 'path', iterates over all sections, returning maintainers
+       for matching ones."""
+    maintainers = []
+    lists = []
+    for section in sections:
+        tmp_maint, tmp_lists = get_section_maintainers(path, section)
+        if tmp_maint:
+            maintainers += tmp_maint
+        if tmp_lists:
+            lists += tmp_lists
+
+    if not maintainers:
+        # If no match found, look for match for (nonexistent) file
+        # REPO.working_dir/<default>
+        print('"%s": no maintainers found, looking for default' % path)
+        if level == 0:
+            maintainers = get_maintainers('<default>', sections, level=level + 1)
+        else:
+            print("No <default> maintainers set for project.")
+        if not maintainers:
+            return None
+
+    return maintainers + lists
+
+def parse_maintainers_line(line):
+    """Parse one line of Maintainers.txt, returning any match group and its key."""
+    for key, expression in EXPRESSIONS.items():
+        match = expression.match(line)
+        if match:
+            return key, match.group(key)
+    return None, None
+
+def parse_maintainers_file(filename):
+    """Parse the Maintainers.txt from top-level of repo and
+       return a list containing dictionaries of all sections."""
+    with open(filename, 'r') as text:
+        line = text.readline()
+        sectionlist = []
+        section = defaultdict(list)
+        while line:
+            key, value = parse_maintainers_line(line)
+            if key and value:
+                section[key].append(value)
+
+            line = text.readline()
+            # If end of section (end of file, or non-tag line encountered)...
+            if not key or not value or not line:
+                # ...if non-empty, append section to list.
+                if section:
+                    sectionlist.append(section.copy())
+                    section.clear()
+
+        return sectionlist
+
+def get_modified_files(repo, args):
+    """Returns a list of the files modified by the commit specified in 'args'."""
+    commit = repo.commit(args.commit)
+    return commit.stats.files
+
+if __name__ == '__main__':
+    PARSER = argparse.ArgumentParser(
+        description='Retrieves information on who to cc for review on a given commit')
+    PARSER.add_argument('commit',
+                        action="store",
+                        help='git revision to examine (default: HEAD)',
+                        nargs='?',
+                        default='HEAD')
+    PARSER.add_argument('-l', '--lookup',
+                        help='Find section matches for path LOOKUP',
+                        required=False)
+    ARGS = PARSER.parse_args()
+
+    REPO = SetupGit.locate_repo()
+
+    CONFIG_FILE = os.path.join(REPO.working_dir, 'Maintainers.txt')
+
+    SECTIONS = parse_maintainers_file(CONFIG_FILE)
+
+    if ARGS.lookup:
+        FILES = [ARGS.lookup]
+    else:
+        FILES = get_modified_files(REPO, ARGS)
+
+    ADDRESSES = []
+
+    for file in FILES:
+        print(file)
+        addresslist = get_maintainers(file, SECTIONS)
+        if addresslist:
+            ADDRESSES += addresslist
+
+    for address in list(OrderedDict.fromkeys(ADDRESSES)):
+        print('  %s' % address)
--
2.32.0.windows.1

[Patch V2 2/3] BaseTools/Scripts: Allow GitHub ID at end Maintainers.txt lines

[Michael D Kinney]

* Update GetMaintainer.py to support an optional GitHub ID at the
  end of maintainer and reviewer lines.
* Remove contents after email address from standard output
* Fix minor issue in --lookup to convert file path separators
  from '\' to '/' to be compatible with regular expression
  file matching.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 BaseTools/Scripts/GetMaintainer.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMaintainer.py
index 5ec851554d64..d1e042c0afe4 100644
--- a/BaseTools/Scripts/GetMaintainer.py
+++ b/BaseTools/Scripts/GetMaintainer.py
@@ -18,7 +18,7 @@ EXPRESSIONS = {
     'exclude':    re.compile(r'^X:\s*(?P<exclude>.*?)\r*$'),
     'file':       re.compile(r'^F:\s*(?P<file>.*?)\r*$'),
     'list':       re.compile(r'^L:\s*(?P<list>.*?)\r*$'),
-    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*<.*?>)\r*$'),
+    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*?)\r*$'),
     'reviewer':   re.compile(r'^R:\s*(?P<reviewer>.*?)\r*$'),
     'status':     re.compile(r'^S:\s*(?P<status>.*?)\r*$'),
     'tree':       re.compile(r'^T:\s*(?P<tree>.*?)\r*$'),
@@ -178,7 +178,7 @@ if __name__ == '__main__':
     SECTIONS = parse_maintainers_file(CONFIG_FILE)
 
     if ARGS.lookup:
-        FILES = [ARGS.lookup]
+        FILES = [ARGS.lookup.replace('\\','/')]
     else:
         FILES = get_modified_files(REPO, ARGS)
 
@@ -191,4 +191,6 @@ if __name__ == '__main__':
             ADDRESSES += addresslist
 
     for address in list(OrderedDict.fromkeys(ADDRESSES)):
+        if '<' in address and '>' in address:
+            address = address.split('>', 1)[0] + '>'
         print('  %s' % address)
-- 
2.32.0.windows.1

Re: [Patch V2 2/3] BaseTools/Scripts: Allow GitHub ID at end Maintainers.txt lines

[Bob Feng]

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: Kinney, Michael D <michael.d.kinney@intel.com> 
Sent: Friday, July 9, 2021 3:51 AM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Subject: [Patch V2 2/3] BaseTools/Scripts: Allow GitHub ID at end Maintainers.txt lines

* Update GetMaintainer.py to support an optional GitHub ID at the
  end of maintainer and reviewer lines.
* Remove contents after email address from standard output
* Fix minor issue in --lookup to convert file path separators
  from '\' to '/' to be compatible with regular expression
  file matching.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 BaseTools/Scripts/GetMaintainer.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMaintainer.py
index 5ec851554d64..d1e042c0afe4 100644
--- a/BaseTools/Scripts/GetMaintainer.py
+++ b/BaseTools/Scripts/GetMaintainer.py
@@ -18,7 +18,7 @@ EXPRESSIONS = {
     'exclude':    re.compile(r'^X:\s*(?P<exclude>.*?)\r*$'),
     'file':       re.compile(r'^F:\s*(?P<file>.*?)\r*$'),
     'list':       re.compile(r'^L:\s*(?P<list>.*?)\r*$'),
-    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*<.*?>)\r*$'),
+    'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*?)\r*$'),
     'reviewer':   re.compile(r'^R:\s*(?P<reviewer>.*?)\r*$'),
     'status':     re.compile(r'^S:\s*(?P<status>.*?)\r*$'),
     'tree':       re.compile(r'^T:\s*(?P<tree>.*?)\r*$'),
@@ -178,7 +178,7 @@ if __name__ == '__main__':
     SECTIONS = parse_maintainers_file(CONFIG_FILE)
 
     if ARGS.lookup:
-        FILES = [ARGS.lookup]
+        FILES = [ARGS.lookup.replace('\\','/')]
     else:
         FILES = get_modified_files(REPO, ARGS)
 
@@ -191,4 +191,6 @@ if __name__ == '__main__':
             ADDRESSES += addresslist
 
     for address in list(OrderedDict.fromkeys(ADDRESSES)):
+        if '<' in address and '>' in address:
+            address = address.split('>', 1)[0] + '>'
         print('  %s' % address)
-- 
2.32.0.windows.1

[Patch V2 3/3] Maintainers.txt: Add GitHub IDs

[Michael D Kinney]

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 | 282 ++++++++++++++++++++++++------------------------
 1 file changed, 139 insertions(+), 143 deletions(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index f4e4c72d0628..575a80be5e89 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@nuviainc.com>
-M: Michael D Kinney <michael.d.kinney@intel.com>
+M: Andrew Fish <afish@apple.com> [ajfish]
+M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 
 Responsible Disclosure, Reporting Security Issues
 -------------------------------------------------
@@ -80,73 +79,72 @@ 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: 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 +159,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 +238,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 +249,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 +264,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 +291,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 +311,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 +330,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 +348,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 +394,33 @@ 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: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
+R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]
 S: Maintained
 
 OvmfPkg: bhyve-related modules
@@ -437,12 +434,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 +453,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 +506,85 @@ 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: 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]
+R: 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
-- 
2.32.0.windows.1

Re: [Patch V2 3/3] Maintainers.txt: Add GitHub IDs

[Laszlo Ersek]

Hi Mike,

On 07/08/21 21:50, 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 | 282 ++++++++++++++++++++++++------------------------
>  1 file changed, 139 insertions(+), 143 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index f4e4c72d0628..575a80be5e89 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@nuviainc.com>
> -M: Michael D Kinney <michael.d.kinney@intel.com>
> +M: Andrew Fish <afish@apple.com> [ajfish]
> +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> +M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
>  
>  Responsible Disclosure, Reporting Security Issues
>  -------------------------------------------------

this patch seems to combine the removal of my entries with the addition
of GitHub IDs.

I'd like to request that my removal patch be committed first, stand-alone.

(I'd like to ask that one of the maintainers or stewards please merge
said patch for me.)

Thank you,
Laszlo


> @@ -80,73 +79,72 @@ 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: 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 +159,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 +238,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 +249,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 +264,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 +291,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 +311,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 +330,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 +348,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 +394,33 @@ 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: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> +R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]
>  S: Maintained
>  
>  OvmfPkg: bhyve-related modules
> @@ -437,12 +434,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 +453,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 +506,85 @@ 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: 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]
> +R: 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
> 

Re: [Patch V2 3/3] Maintainers.txt: Add GitHub IDs

[Michael D Kinney]

Hi Laszlo,

Understood.  I will merge your patch first.  Then rebase mine.

Thanks,

Mike

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Friday, July 9, 2021 5:23 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm <leif@nuviainc.com>; Ard Biesheuvel (TianoCore)
> <ardb+tianocore@kernel.org>
> Subject: Re: [Patch V2 3/3] Maintainers.txt: Add GitHub IDs
> 
> Hi Mike,
> 
> On 07/08/21 21:50, 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 | 282 ++++++++++++++++++++++++------------------------
> >  1 file changed, 139 insertions(+), 143 deletions(-)
> >
> > diff --git a/Maintainers.txt b/Maintainers.txt
> > index f4e4c72d0628..575a80be5e89 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@nuviainc.com>
> > -M: Michael D Kinney <michael.d.kinney@intel.com>
> > +M: Andrew Fish <afish@apple.com> [ajfish]
> > +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> > +M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> >
> >  Responsible Disclosure, Reporting Security Issues
> >  -------------------------------------------------
> 
> this patch seems to combine the removal of my entries with the addition
> of GitHub IDs.
> 
> I'd like to request that my removal patch be committed first, stand-alone.
> 
> (I'd like to ask that one of the maintainers or stewards please merge
> said patch for me.)
> 
> Thank you,
> Laszlo
> 
> 
> > @@ -80,73 +79,72 @@ 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: 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 +159,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 +238,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 +249,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 +264,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 +291,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 +311,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 +330,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 +348,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 +394,33 @@ 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: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> > +R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]
> >  S: Maintained
> >
> >  OvmfPkg: bhyve-related modules
> > @@ -437,12 +434,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 +453,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 +506,85 @@ 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: 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]
> > +R: 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
> >

Re: [Patch V2 3/3] Maintainers.txt: Add GitHub IDs

[Andrew Fish]

Reviewed-by: Andrew Fish <afish@apple.com>

> On Jul 8, 2021, at 12:50 PM, Michael D Kinney <michael.d.kinney@intel.com> 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 | 282 ++++++++++++++++++++++++------------------------
> 1 file changed, 139 insertions(+), 143 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index f4e4c72d0628..575a80be5e89 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@nuviainc.com>
> -M: Michael D Kinney <michael.d.kinney@intel.com>
> +M: Andrew Fish <afish@apple.com> [ajfish]
> +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> +M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> 
> Responsible Disclosure, Reporting Security Issues
> -------------------------------------------------
> @@ -80,73 +79,72 @@ 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: 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 +159,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 +238,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 +249,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 +264,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 +291,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 +311,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 +330,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 +348,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 +394,33 @@ 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: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> +R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]
> S: Maintained
> 
> OvmfPkg: bhyve-related modules
> @@ -437,12 +434,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 +453,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 +506,85 @@ 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: 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]
> +R: 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
> -- 
> 2.32.0.windows.1
> 

Re: [Patch V2 3/3] Maintainers.txt: Add GitHub IDs

[Leif Lindholm]

On Thu, Jul 08, 2021 at 12:50:47 -0700, 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>

Reviewed-by: Leif Lindholm <leif@nuviainc.com>

Apologies for tardiness.

> ---
>  Maintainers.txt | 282 ++++++++++++++++++++++++------------------------
>  1 file changed, 139 insertions(+), 143 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index f4e4c72d0628..575a80be5e89 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@nuviainc.com>
> -M: Michael D Kinney <michael.d.kinney@intel.com>
> +M: Andrew Fish <afish@apple.com> [ajfish]
> +M: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
> +M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
>  
>  Responsible Disclosure, Reporting Security Issues
>  -------------------------------------------------
> @@ -80,73 +79,72 @@ 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: 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 +159,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 +238,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 +249,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 +264,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 +291,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 +311,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 +330,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 +348,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 +394,33 @@ 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: Ard Biesheuvel <ardb+tianocore@kernel.org> [ardbiesheuvel]
> +R: Jordan Justen <jordan.l.justen@intel.com> [jljusten]
>  S: Maintained
>  
>  OvmfPkg: bhyve-related modules
> @@ -437,12 +434,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 +453,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 +506,85 @@ 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: 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]
> +R: 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
> -- 
> 2.32.0.windows.1
> 

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

[Sean]

Is Maintainers.txt a standard file used by standard tools or just a 
custom file for the GetMaintainer.py script?

There is a similar idea used by github (and maybe others) called 
CODEOWNERS.  See 
https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners

This allows github to auto assign reviewers to a PR.  Would it make 
sense to try to align?

Thanks
Sean



On 7/8/2021 12:50 PM, Michael D Kinney wrote:
> New in V2
> =========
> * Maintainers.txt updates
> * Remove content after email address from standard output
> * Fix --lookup compatibility with '\' path separators.
> 
> Update GetMaintainer.py to allow a GitHub ID after the email address
> for maintainers and reviewers and update Maitainers.txt with GitHub IDs.
> 
> The GitHub ID will be used to help autotate the PR reviewer assignments.
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Michael D Kinney (3):
>    BaseTools/Scripts: Fix GetMaintainer.py line endings
>    BaseTools/Scripts: Allow GitHub ID at end Maintainers.txt lines
>    Maintainers.txt: Add GitHub IDs
> 
>   BaseTools/Scripts/GetMaintainer.py | 382 +++++++++++++++--------------
>   Maintainers.txt                    | 282 +++++++++++----------
>   2 files changed, 331 insertions(+), 333 deletions(-)
> 

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

[Michael D Kinney]

Hi Sean,

Maintainers.txt is a standard file format defined by TianoCore.  Format is in file header.
The intent is for the file format to be consumable by tools and developers.

I reviewed CODEOWERS feature.  It has limitations that do not match the EDK II development process.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean
> Sent: Thursday, July 8, 2021 12:55 PM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Leif Lindholm <leif@nuviainc.com>; Feng, Bob C
> <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
> Subject: Re: [edk2-devel] [Patch V2 0/3] Add GitHub IDs to Maintainers.txt
> 
> Is Maintainers.txt a standard file used by standard tools or just a
> custom file for the GetMaintainer.py script?
> 
> There is a similar idea used by github (and maybe others) called
> CODEOWNERS.  See
> https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-
> owners
> 
> This allows github to auto assign reviewers to a PR.  Would it make
> sense to try to align?
> 
> Thanks
> Sean
> 
> 
> 
> On 7/8/2021 12:50 PM, Michael D Kinney wrote:
> > New in V2
> > =========
> > * Maintainers.txt updates
> > * Remove content after email address from standard output
> > * Fix --lookup compatibility with '\' path separators.
> >
> > Update GetMaintainer.py to allow a GitHub ID after the email address
> > for maintainers and reviewers and update Maitainers.txt with GitHub IDs.
> >
> > The GitHub ID will be used to help autotate the PR reviewer assignments.
> >
> > Cc: Andrew Fish <afish@apple.com>
> > Cc: Laszlo Ersek <lersek@redhat.com>
> > Cc: Leif Lindholm <leif@nuviainc.com>
> > Cc: Bob Feng <bob.c.feng@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> >
> > Michael D Kinney (3):
> >    BaseTools/Scripts: Fix GetMaintainer.py line endings
> >    BaseTools/Scripts: Allow GitHub ID at end Maintainers.txt lines
> >    Maintainers.txt: Add GitHub IDs
> >
> >   BaseTools/Scripts/GetMaintainer.py | 382 +++++++++++++++--------------
> >   Maintainers.txt                    | 282 +++++++++++----------
> >   2 files changed, 331 insertions(+), 333 deletions(-)
> >
> 
> 
> 
>