[PATCH 00/22] .mailmap: add mappings after edk2-stable202008

[PATCH 00/22] .mailmap: add mappings after edk2-stable202008

[Laszlo Ersek]

Repo:   https://pagure.io/lersek/edk2.git
Branch: update_mailmap_edk2stable202008

If you (singular) are on the CC list of this email (and you are not
Phil), then the output of the following command:

$ git shortlog edk2-stable201905..edk2-stable202008

prints something dubious in relation to you. For example, you could be
listed under two different names, or your name might not appear to be
your real name (per "Developer Certificate of Origin" in "ReadMe.rst").

The patch that you receive in addition to this blurb seeks to solve that
particular issue. Please (a) run the above git-shortlog command and save
the output, (b) apply (or fetch) this series, (c) re-run the
git-shortlog command, (d) if you are OK with the differences related to
your name, please respond with an Acked-by or Reviewed-by to the
specific patch.

Importantly, cross-domain mappings are NOT introduced, so if there's no
feedback from you in a week or so, we can merge the patch anyway (with
steward approval).

Thanks,
Laszlo

Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
Cc: Derek Lin <derek.lin2@hpe.com>
Cc: Eric Jin <eric.jin@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Kun Qin <kuqin@microsoft.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Maggie Chu <maggie.chu@intel.com>
Cc: Marc W Chen <marc.w.chen@intel.com>
Cc: Matt DeVillier <matt.devillier@gmail.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Paul Grimes <paul.grimes@amd.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Qi Zhang <qi1.zhang@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Cc: Steven Shi <steven.shi@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
Cc: Wei6 Xu <wei6.xu@intel.com>
Cc: XiaoyuX Lu <xiaoyux.lu@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>

Laszlo Ersek (22):
  .mailmap: add entry for Marc W Chen
  .mailmap: add entry for Ching JenX Cheng
  .mailmap: add entries for Maggie Chu
  .mailmap: add entries for Guo Dong
  .mailmap: add entry for Zhichao Gao
  .mailmap: add entries for Guomin Jiang
  .mailmap: add entry for Eric Jin
  .mailmap: add entry for Michael D Kinney
  .mailmap: add entry for Tom Lendacky
  .mailmap: add entry for Derek Lin
  .mailmap: add entry for Zhiguang Liu
  .mailmap: add entry for XiaoyuX Lu
  .mailmap: add entry for Steven Shi
  .mailmap: add entry for Jiaxin Wu
  .mailmap: add entry for Wei6 Xu
  .mailmap: add entry for Qi Zhang
  .mailmap: add entry for Matt DeVillier
  .mailmap: add entry for Paul Grimes
  .mailmap: add (another) entry for Vladimir Olovyannikov
  .mailmap: add (another) entry for Liming Gao
  .mailmap: add entry for Kun Qin
  .mailmap: add entries for Rebecca Cran

 .mailmap | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

-- 
2.19.1.3.g30247aa5d201

[PATCH 01/22] .mailmap: add entry for Marc W Chen

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Marc W Chen <marc.w.chen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index ba246ff6cd80..f173754d7ee8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -44,6 +44,7 @@ Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
 Liming Gao <liming.gao@intel.com> <liming.gao@intel.com>
 Maciej Rabeda <maciej.rabeda@intel.com>
 Marc-André Lureau <marcandre.lureau@redhat.com> <marcandre.lureau@redhat.com>
+Marc W Chen <marc.w.chen@intel.com>
 Marvin Häuser <Marvin.Haeuser@outlook.com>
 Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>
 Marvin Häuser <mhaeuser@outlook.de>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 01/22] .mailmap: add entry for Marc W Chen

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Marc W Chen <marc.w.chen@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index ba246ff6cd80..f173754d7ee8 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -44,6 +44,7 @@ Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
>  Liming Gao <liming.gao@intel.com> <liming.gao@intel.com>
>  Maciej Rabeda <maciej.rabeda@intel.com>
>  Marc-André Lureau <marcandre.lureau@redhat.com> <marcandre.lureau@redhat.com>
> +Marc W Chen <marc.w.chen@intel.com>

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

>  Marvin Häuser <Marvin.Haeuser@outlook.com>
>  Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>
>  Marvin Häuser <mhaeuser@outlook.de>
> 

[PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index f173754d7ee8..c2eeee2834e2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,7 @@ Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
 Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
 Baraneedharan Anbazhagan <anbazhagan@hp.com>
 Chasel Chiu <chasel.chiu@intel.com>
+Ching JenX Cheng <ching.jenx.cheng@intel.com>
 Christopher J Zurcher <christopher.j.zurcher@intel.com>
 Eric Dong <eric.dong@intel.com>
 Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index f173754d7ee8..c2eeee2834e2 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -16,6 +16,7 @@ Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
>  Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
>  Baraneedharan Anbazhagan <anbazhagan@hp.com>
>  Chasel Chiu <chasel.chiu@intel.com>
> +Ching JenX Cheng <ching.jenx.cheng@intel.com>

In my mailmap I have:

Cheng Ching Jen <ching.jenx.cheng@intel.com>

>  Christopher J Zurcher <christopher.j.zurcher@intel.com>
>  Eric Dong <eric.dong@intel.com>
>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
> 

Re: [PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Laszlo Ersek]

On 09/17/20 16:47, Philippe Mathieu-Daudé wrote:
> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>> ... for git-shortlog purposes.
>>
>> Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>  .mailmap | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index f173754d7ee8..c2eeee2834e2 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -16,6 +16,7 @@ Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
>>  Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
>>  Baraneedharan Anbazhagan <anbazhagan@hp.com>
>>  Chasel Chiu <chasel.chiu@intel.com>
>> +Ching JenX Cheng <ching.jenx.cheng@intel.com>
> 
> In my mailmap I have:
> 
> Cheng Ching Jen <ching.jenx.cheng@intel.com>

- Do you mean your local / personal mailmap?

- Intel email addresses have the format
<given_name.family_name@intel.com>, where given_name may carry a "middle
name" (initial) as well, plus it may be terminated with an X, to show
that the person is a contractor. So with <ching.jenx.cheng@intel.com>,
the developer is a contractor, not an employee, their family name is
"Cheng", and their given names are "Ching Jen".

Then, in the mailmap file, we use the "FirstName LastName" format (to
stick with the English / international custom). So I think my proposal
is the correct one; at most I should drop the X. Your version ("Cheng
Ching Jen") is the native Chinese name order, which is the inverse of
the English one.

Thanks
Laszlo

> 
>>  Christopher J Zurcher <christopher.j.zurcher@intel.com>
>>  Eric Dong <eric.dong@intel.com>
>>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
>>
> 

Re: [PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Philippe Mathieu-Daudé]

On 9/17/20 5:28 PM, Laszlo Ersek wrote:
> On 09/17/20 16:47, Philippe Mathieu-Daudé wrote:
>> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>>> ... for git-shortlog purposes.
>>>
>>> Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>>> ---
>>>  .mailmap | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/.mailmap b/.mailmap
>>> index f173754d7ee8..c2eeee2834e2 100644
>>> --- a/.mailmap
>>> +++ b/.mailmap
>>> @@ -16,6 +16,7 @@ Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
>>>  Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
>>>  Baraneedharan Anbazhagan <anbazhagan@hp.com>
>>>  Chasel Chiu <chasel.chiu@intel.com>
>>> +Ching JenX Cheng <ching.jenx.cheng@intel.com>
>>
>> In my mailmap I have:
>>
>> Cheng Ching Jen <ching.jenx.cheng@intel.com>
> 
> - Do you mean your local / personal mailmap?

Yes, the EDK2 mailmap I keep rebasing for EDK2
statistics using git-dm.

IIUC from my previous series I'm not authorized
to contribute it, so I stopped posting the updates.

> 
> - Intel email addresses have the format
> <given_name.family_name@intel.com>, where given_name may carry a "middle
> name" (initial) as well, plus it may be terminated with an X, to show
> that the person is a contractor. So with <ching.jenx.cheng@intel.com>,
> the developer is a contractor, not an employee, their family name is
> "Cheng", and their given names are "Ching Jen".
> 
> Then, in the mailmap file, we use the "FirstName LastName" format (to
> stick with the English / international custom). So I think my proposal
> is the correct one; at most I should drop the X. Your version ("Cheng
> Ching Jen") is the native Chinese name order, which is the inverse of
> the English one.

OK I didn't know the format has to follow the English name order.
I used the Chinese name order because I found somewhere in the
EDK2 archives some posts signed as "Cheng Ching Jen", so I took
this order to respect the author preference.

> 
> Thanks
> Laszlo
> 
>>
>>>  Christopher J Zurcher <christopher.j.zurcher@intel.com>
>>>  Eric Dong <eric.dong@intel.com>
>>>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
>>>
>>
> 

Re: [PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Laszlo Ersek]

On 09/17/20 18:45, Philippe Mathieu-Daudé wrote:
> On 9/17/20 5:28 PM, Laszlo Ersek wrote:
>> On 09/17/20 16:47, Philippe Mathieu-Daudé wrote:
>>> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>>>> ... for git-shortlog purposes.
>>>>
>>>> Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
>>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>>>> ---
>>>>  .mailmap | 1 +
>>>>  1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/.mailmap b/.mailmap
>>>> index f173754d7ee8..c2eeee2834e2 100644
>>>> --- a/.mailmap
>>>> +++ b/.mailmap
>>>> @@ -16,6 +16,7 @@ Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
>>>>  Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
>>>>  Baraneedharan Anbazhagan <anbazhagan@hp.com>
>>>>  Chasel Chiu <chasel.chiu@intel.com>
>>>> +Ching JenX Cheng <ching.jenx.cheng@intel.com>
>>>
>>> In my mailmap I have:
>>>
>>> Cheng Ching Jen <ching.jenx.cheng@intel.com>
>>
>> - Do you mean your local / personal mailmap?
> 
> Yes, the EDK2 mailmap I keep rebasing for EDK2
> statistics using git-dm.
> 
> IIUC from my previous series I'm not authorized
> to contribute it, so I stopped posting the updates.

I don't understand ("not authorized to contribute it"). Can you explain?
How can be "authorization" missing for contributing changes to a mailmap
file? Do you have a link perhaps?

That said... seeing how few people have responded to this patch series,
especially from Intel, I'm inclined to just merge the patches that have
been approved by the subject contributors, and simply drop the rest.

And then -- for the sake of QEMU (= git-shortlog), and for git-dm --, we
could maintain our own separate mailmap file, *on top*. We could start
with what you already have, just move it to a git repository somewhere
(internally to RH, or under your public gitlab space, or wherever). So
that multiple folks could rely on that mailmap (when updating the
bundled binaries in QEMU), and multiple folks could propose updates.

What do you think?

Thanks!
Laszlo


> 
>>
>> - Intel email addresses have the format
>> <given_name.family_name@intel.com>, where given_name may carry a "middle
>> name" (initial) as well, plus it may be terminated with an X, to show
>> that the person is a contractor. So with <ching.jenx.cheng@intel.com>,
>> the developer is a contractor, not an employee, their family name is
>> "Cheng", and their given names are "Ching Jen".
>>
>> Then, in the mailmap file, we use the "FirstName LastName" format (to
>> stick with the English / international custom). So I think my proposal
>> is the correct one; at most I should drop the X. Your version ("Cheng
>> Ching Jen") is the native Chinese name order, which is the inverse of
>> the English one.
> 
> OK I didn't know the format has to follow the English name order.
> I used the Chinese name order because I found somewhere in the
> EDK2 archives some posts signed as "Cheng Ching Jen", so I took
> this order to respect the author preference.
> 
>>
>> Thanks
>> Laszlo
>>
>>>
>>>>  Christopher J Zurcher <christopher.j.zurcher@intel.com>
>>>>  Eric Dong <eric.dong@intel.com>
>>>>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
>>>>
>>>
>>
> 

Re: [PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Laszlo Ersek]

On 09/17/20 18:45, Philippe Mathieu-Daudé wrote:

> OK I didn't know the format has to follow the English name order.
> I used the Chinese name order because I found somewhere in the
> EDK2 archives some posts signed as "Cheng Ching Jen", so I took
> this order to respect the author preference.

Thanks -- this is a convincing argument.

Gives me the following idea: the mailmap file supports comments (see at
the end of git-shortlog). Thus, at least when we extend our own mailmap
for edk2, we should always include some references (mailing list links,
commit hashes, etc) near the newly added entries that justify the entries.

Thanks!
Laszlo

Re: [PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Philippe Mathieu-Daudé]

On 9/22/20 9:22 AM, Laszlo Ersek wrote:
> On 09/17/20 18:45, Philippe Mathieu-Daudé wrote:
> 
>> OK I didn't know the format has to follow the English name order.
>> I used the Chinese name order because I found somewhere in the
>> EDK2 archives some posts signed as "Cheng Ching Jen", so I took
>> this order to respect the author preference.
> 
> Thanks -- this is a convincing argument.
> 
> Gives me the following idea: the mailmap file supports comments (see at
> the end of git-shortlog). Thus, at least when we extend our own mailmap
> for edk2, we should always include some references (mailing list links,
> commit hashes, etc) near the newly added entries that justify the entries.

Ah this is an excellent idea, that way we could fix old contributions
even if the contributor left the community.

> 
> Thanks!
> Laszlo
> 

Re: [PATCH 02/22] .mailmap: add entry for Ching JenX Cheng

[Laszlo Ersek]

On 09/22/20 11:38, Philippe Mathieu-Daudé wrote:
> On 9/22/20 9:22 AM, Laszlo Ersek wrote:
>> On 09/17/20 18:45, Philippe Mathieu-Daudé wrote:
>>
>>> OK I didn't know the format has to follow the English name order.
>>> I used the Chinese name order because I found somewhere in the
>>> EDK2 archives some posts signed as "Cheng Ching Jen", so I took
>>> this order to respect the author preference.
>>
>> Thanks -- this is a convincing argument.
>>
>> Gives me the following idea: the mailmap file supports comments (see at
>> the end of git-shortlog). Thus, at least when we extend our own mailmap
>> for edk2, we should always include some references (mailing list links,
>> commit hashes, etc) near the newly added entries that justify the entries.
> 
> Ah this is an excellent idea,

Thanks!

> that way we could fix old contributions
> even if the contributor left the community.

To clarify: this was meant for our own mailmap for edk2 (out-of-tree);
that is, *not* the .mailmap file in the edk2 project root directory.

Again -- my experience with this 22-part patch set tells me that it
makes no sense to spend time improving the upstream .mailmap file.
Because, feedback has been extremely lacking. So the "use comments"
trick would apply to the mailmap file that we would maintain *outside*
of edk2, just for our particular purposes (git-dm, git-shortlog for
QEMU's edk2 submodule updates, etc).

I'll go ahead and merge the patches from this series that have been
approved by the respective email addresses' owners, and drop the rest.
(We could incorporate them into the out-of-tree mailmap file, later.)

Thanks
Laszlo

[PATCH 03/22] .mailmap: add entries for Maggie Chu

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Maggie Chu <maggie.chu@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index c2eeee2834e2..38cfec35c70e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -44,6 +44,8 @@ Liming Gao <liming.gao@intel.com> <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
 Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
 Liming Gao <liming.gao@intel.com> <liming.gao@intel.com>
 Maciej Rabeda <maciej.rabeda@intel.com>
+Maggie Chu <maggie.chu@intel.com>
+Maggie Chu <maggie.chu@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=fe425ca7e5f4401abed22b904fe5d964>
 Marc-André Lureau <marcandre.lureau@redhat.com> <marcandre.lureau@redhat.com>
 Marc W Chen <marc.w.chen@intel.com>
 Marvin Häuser <Marvin.Haeuser@outlook.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 03/22] .mailmap: add entries for Maggie Chu

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Maggie Chu <maggie.chu@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index c2eeee2834e2..38cfec35c70e 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -44,6 +44,8 @@ Liming Gao <liming.gao@intel.com> <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
>  Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
>  Liming Gao <liming.gao@intel.com> <liming.gao@intel.com>
>  Maciej Rabeda <maciej.rabeda@intel.com>
> +Maggie Chu <maggie.chu@intel.com>
> +Maggie Chu <maggie.chu@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=fe425ca7e5f4401abed22b904fe5d964>

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

>  Marc-André Lureau <marcandre.lureau@redhat.com> <marcandre.lureau@redhat.com>
>  Marc W Chen <marc.w.chen@intel.com>
>  Marvin Häuser <Marvin.Haeuser@outlook.com>
> 

[PATCH 04/22] .mailmap: add entries for Guo Dong

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 38cfec35c70e..8ed1d77c9220 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,6 +25,8 @@ Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
 Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
 Eugene Cohen <eugene@nuviainc.com>
 Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
+Guo Dong <guo.dong@intel.com>
+Guo Dong <guo.dong@intel.com> </O=Intel/OU=Pacifica02/cn=Recipients/cn=gdong1>
 Hao A Wu <hao.a.wu@intel.com>
 Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>
 Hot Tian <hot.tian@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 04/22] .mailmap: add entries for Guo Dong

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Guo Dong <guo.dong@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 38cfec35c70e..8ed1d77c9220 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -25,6 +25,8 @@ Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
>  Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
>  Eugene Cohen <eugene@nuviainc.com>
>  Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
> +Guo Dong <guo.dong@intel.com>
> +Guo Dong <guo.dong@intel.com> </O=Intel/OU=Pacifica02/cn=Recipients/cn=gdong1>

Also:

Guo Dong <guo.dong@intel.com> <gdong1>
Guo Dong <guo.dong@intel.com> <gdong1@6f19259b-4bc3-4df7-8a09-765794883524>

>  Hao A Wu <hao.a.wu@intel.com>
>  Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>
>  Hot Tian <hot.tian@intel.com>
> 

Re: [PATCH 04/22] .mailmap: add entries for Guo Dong

[Laszlo Ersek]

On 09/17/20 16:48, Philippe Mathieu-Daudé wrote:
> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>> ... for git-shortlog purposes.
>>
>> Cc: Guo Dong <guo.dong@intel.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>  .mailmap | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index 38cfec35c70e..8ed1d77c9220 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -25,6 +25,8 @@ Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
>>  Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
>>  Eugene Cohen <eugene@nuviainc.com>
>>  Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
>> +Guo Dong <guo.dong@intel.com>
>> +Guo Dong <guo.dong@intel.com> </O=Intel/OU=Pacifica02/cn=Recipients/cn=gdong1>
> 
> Also:
> 
> Guo Dong <guo.dong@intel.com> <gdong1>
> Guo Dong <guo.dong@intel.com> <gdong1@6f19259b-4bc3-4df7-8a09-765794883524>
> 
>>  Hao A Wu <hao.a.wu@intel.com>
>>  Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>
>>  Hot Tian <hot.tian@intel.com>
>>
> 

True, thanks!
Laszlo

[PATCH 05/22] .mailmap: add entry for Zhichao Gao

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 8ed1d77c9220..a7e2fea7419b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -77,3 +77,4 @@ Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov
 Yonghong Zhu <yonghong.zhu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
 Yu-Chen Lin <yuchenlin@synology.com>
+Zhichao Gao <zhichao.gao@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 05/22] .mailmap: add entry for Zhichao Gao

[Gao, Zhichao]

Acked-by: Zhichao Gao <zhichao.gao@intel.com>

Thanks,
Zhichao

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Tuesday, September 8, 2020 3:31 AM
> To: edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>; Gao, Zhichao
> <zhichao.gao@intel.com>
> Subject: [PATCH 05/22] .mailmap: add entry for Zhichao Gao
> 
> ... for git-shortlog purposes.
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 8ed1d77c9220..a7e2fea7419b 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -77,3 +77,4 @@ Vladimir Olovyannikov
> <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov  Yonghong Zhu
> <yonghong.zhu@intel.com>  Yonghong Zhu <yonghong.zhu@intel.com>
> <yzhu52@Edk2>  Yu-Chen Lin <yuchenlin@synology.com>
> +Zhichao Gao <zhichao.gao@intel.com>
> --
> 2.19.1.3.g30247aa5d201
> 

[PATCH 06/22] .mailmap: add entries for Guomin Jiang

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index a7e2fea7419b..df05a29ed3bf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,8 @@ Eugene Cohen <eugene@nuviainc.com>
 Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
 Guo Dong <guo.dong@intel.com>
 Guo Dong <guo.dong@intel.com> </O=Intel/OU=Pacifica02/cn=Recipients/cn=gdong1>
+Guomin Jiang <guomin.jiang@intel.com>
+Guomin Jiang <newexplorerj@gmail.com>
 Hao A Wu <hao.a.wu@intel.com>
 Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>
 Hot Tian <hot.tian@intel.com>
-- 
2.19.1.3.g30247aa5d201

[PATCH 07/22] .mailmap: add entry for Eric Jin

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Eric Jin <eric.jin@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index df05a29ed3bf..47608acbf931 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,6 +22,7 @@ Eric Dong <eric.dong@intel.com>
 Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
 Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
 Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
+Eric Jin <eric.jin@intel.com>
 Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
 Eugene Cohen <eugene@nuviainc.com>
 Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 07/22] .mailmap: add entry for Eric Jin

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Eric Jin <eric.jin@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index df05a29ed3bf..47608acbf931 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -22,6 +22,7 @@ Eric Dong <eric.dong@intel.com>
>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
>  Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
>  Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
> +Eric Jin <eric.jin@intel.com>

Also:

Eric Jin <eric.jin@intel.com> <jjin9@6f19259b-4bc3-4df7-8a09-765794883524>

>  Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
>  Eugene Cohen <eugene@nuviainc.com>
>  Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
> 

Re: [PATCH 07/22] .mailmap: add entry for Eric Jin

[Laszlo Ersek]

On 09/17/20 16:49, Philippe Mathieu-Daudé wrote:
> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>> ... for git-shortlog purposes.
>>
>> Cc: Eric Jin <eric.jin@intel.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>  .mailmap | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index df05a29ed3bf..47608acbf931 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -22,6 +22,7 @@ Eric Dong <eric.dong@intel.com>
>>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
>>  Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
>>  Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
>> +Eric Jin <eric.jin@intel.com>
> 
> Also:
> 
> Eric Jin <eric.jin@intel.com> <jjin9@6f19259b-4bc3-4df7-8a09-765794883524>

Commits with such an author exist, but how do you know that it's the
same person?

Thanks
Laszlo

> 
>>  Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
>>  Eugene Cohen <eugene@nuviainc.com>
>>  Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
>>
> 

Re: [PATCH 07/22] .mailmap: add entry for Eric Jin

[Philippe Mathieu-Daudé]

On 9/17/20 5:34 PM, Laszlo Ersek wrote:
> On 09/17/20 16:49, Philippe Mathieu-Daudé wrote:
>> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>>> ... for git-shortlog purposes.
>>>
>>> Cc: Eric Jin <eric.jin@intel.com>
>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>>> ---
>>>  .mailmap | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/.mailmap b/.mailmap
>>> index df05a29ed3bf..47608acbf931 100644
>>> --- a/.mailmap
>>> +++ b/.mailmap
>>> @@ -22,6 +22,7 @@ Eric Dong <eric.dong@intel.com>
>>>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
>>>  Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
>>>  Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
>>> +Eric Jin <eric.jin@intel.com>
>>
>> Also:
>>
>> Eric Jin <eric.jin@intel.com> <jjin9@6f19259b-4bc3-4df7-8a09-765794883524>
> 
> Commits with such an author exist, but how do you know that it's the
> same person?

What I did last time is cross-reference the names listed in
https://sourceforge.net/p/edk2/_members/ with the EDK2 archive.

I kept out the unsure aliases. But it is certainly safer if the
author is still active and can confirm that he/she is the same
person.

> 
> Thanks
> Laszlo
> 
>>
>>>  Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
>>>  Eugene Cohen <eugene@nuviainc.com>
>>>  Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>
>>>
>>
> 

[PATCH 08/22] .mailmap: add entry for Michael D Kinney

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 47608acbf931..2e23a0f43814 100644
--- a/.mailmap
+++ b/.mailmap
@@ -57,6 +57,7 @@ Marvin Häuser <Marvin.Haeuser@outlook.com>
 Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>
 Marvin Häuser <mhaeuser@outlook.de>
 Maurice Ma <maurice.ma@intel.com>
+Michael D Kinney <michael.d.kinney@intel.com>
 Michael Kubacki <michael.a.kubacki@intel.com>
 Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=3c8b0226e75f4ab08d20c151cb7a8a72>
 Ming Tan <ming.tan@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 08/22] .mailmap: add entry for Michael D Kinney

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 47608acbf931..2e23a0f43814 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -57,6 +57,7 @@ Marvin Häuser <Marvin.Haeuser@outlook.com>
>  Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>
>  Marvin Häuser <mhaeuser@outlook.de>
>  Maurice Ma <maurice.ma@intel.com>
> +Michael D Kinney <michael.d.kinney@intel.com>

Also:

Michael Kinney <michael.d.kinney@intel.com>
<mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
Michael Kinney <michael.d.kinney@intel.com> <mdkinney@Edk2>
Michael Kinney <michael.d.kinney@intel.com>
<mdkinney@mdkinney-desk.amr.corp.intel.com>
Michael Kinney <michael.d.kinney@intel.com> <Michael.d.kinney@intel.com>
Michael Kinney <michael.d.kinney@intel.com>
</o=Intel/ou=Americas01/cn=Workers/cn=Kinney, Michael D>

>  Michael Kubacki <michael.a.kubacki@intel.com>
>  Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=3c8b0226e75f4ab08d20c151cb7a8a72>
>  Ming Tan <ming.tan@intel.com>
> 

Re: [PATCH 08/22] .mailmap: add entry for Michael D Kinney

[Laszlo Ersek]

On 09/17/20 16:50, Philippe Mathieu-Daudé wrote:
> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>> ... for git-shortlog purposes.
>>
>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>  .mailmap | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index 47608acbf931..2e23a0f43814 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -57,6 +57,7 @@ Marvin Häuser <Marvin.Haeuser@outlook.com>
>>  Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>
>>  Marvin Häuser <mhaeuser@outlook.de>
>>  Maurice Ma <maurice.ma@intel.com>
>> +Michael D Kinney <michael.d.kinney@intel.com>
> 
> Also:
> 
> Michael Kinney <michael.d.kinney@intel.com>
> <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
> Michael Kinney <michael.d.kinney@intel.com> <mdkinney@Edk2>
> Michael Kinney <michael.d.kinney@intel.com>
> <mdkinney@mdkinney-desk.amr.corp.intel.com>

OK

> Michael Kinney <michael.d.kinney@intel.com> <Michael.d.kinney@intel.com>

this one seems redundant (the email addresses are the same, ignoring case)

> Michael Kinney <michael.d.kinney@intel.com>
> </o=Intel/ou=Americas01/cn=Workers/cn=Kinney, Michael D>

Thanks!
Laszlo

> 
>>  Michael Kubacki <michael.a.kubacki@intel.com>
>>  Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=3c8b0226e75f4ab08d20c151cb7a8a72>
>>  Ming Tan <ming.tan@intel.com>
>>
> 

[PATCH 09/22] .mailmap: add entry for Tom Lendacky

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 2e23a0f43814..0d2be4255ff8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -76,6 +76,7 @@ Shenglei Zhang <shenglei.zhang@intel.com>
 Star Zeng <star.zeng@intel.com>
 Star Zeng <star.zeng@intel.com> <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
 Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
+Tom Lendacky <thomas.lendacky@amd.com>
 Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
 Yonghong Zhu <yonghong.zhu@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 09/22] .mailmap: add entry for Tom Lendacky

[Lendacky, Thomas]

On 9/7/20 2:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Acked-by: Tom Lendacky <thomas.lendacky@amd.com>

Thanks,
Tom

> ---
>   .mailmap | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 2e23a0f43814..0d2be4255ff8 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -76,6 +76,7 @@ Shenglei Zhang <shenglei.zhang@intel.com>
>   Star Zeng <star.zeng@intel.com>
>   Star Zeng <star.zeng@intel.com> <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
>   Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
> +Tom Lendacky <thomas.lendacky@amd.com>
>   Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>   Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
>   Yonghong Zhu <yonghong.zhu@intel.com>
> 

[PATCH 10/22] .mailmap: add entry for Derek Lin

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Derek Lin <derek.lin2@hpe.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 0d2be4255ff8..33ecbffa5191 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ Baraneedharan Anbazhagan <anbazhagan@hp.com>
 Chasel Chiu <chasel.chiu@intel.com>
 Ching JenX Cheng <ching.jenx.cheng@intel.com>
 Christopher J Zurcher <christopher.j.zurcher@intel.com>
+Derek Lin <derek.lin2@hpe.com>
 Eric Dong <eric.dong@intel.com>
 Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
 Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 10/22] .mailmap: add entry for Derek Lin

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Derek Lin <derek.lin2@hpe.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 0d2be4255ff8..33ecbffa5191 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -18,6 +18,7 @@ Baraneedharan Anbazhagan <anbazhagan@hp.com>
>  Chasel Chiu <chasel.chiu@intel.com>
>  Ching JenX Cheng <ching.jenx.cheng@intel.com>
>  Christopher J Zurcher <christopher.j.zurcher@intel.com>
> +Derek Lin <derek.lin2@hpe.com>
>  Eric Dong <eric.dong@intel.com>
>  Eric Dong <eric.dong@intel.com> Eric Dong <eirc.dong@intel.com>
>  Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
> 

FWIW:
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

[PATCH 11/22] .mailmap: add entry for Zhiguang Liu

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 33ecbffa5191..3866642d4dbe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -84,3 +84,4 @@ Yonghong Zhu <yonghong.zhu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
 Yu-Chen Lin <yuchenlin@synology.com>
 Zhichao Gao <zhichao.gao@intel.com>
+Zhiguang Liu <zhiguang.liu@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 11/22] .mailmap: add entry for Zhiguang Liu

[Zhiguang Liu]

Thanks Laszlo.

Reviewed-by: Zhiguang Liu <zhiguang.liu@intel.com>

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Tuesday, September 8, 2020 3:31 AM
> To: edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>; Liu, Zhiguang
> <zhiguang.liu@intel.com>
> Subject: [PATCH 11/22] .mailmap: add entry for Zhiguang Liu
> 
> ... for git-shortlog purposes.
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 33ecbffa5191..3866642d4dbe 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -84,3 +84,4 @@ Yonghong Zhu <yonghong.zhu@intel.com>
>  Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
>  Yu-Chen Lin <yuchenlin@synology.com>
>  Zhichao Gao <zhichao.gao@intel.com>
> +Zhiguang Liu <zhiguang.liu@intel.com>
> --
> 2.19.1.3.g30247aa5d201
> 

[PATCH 12/22] .mailmap: add entry for XiaoyuX Lu

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: XiaoyuX Lu <xiaoyux.lu@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 3866642d4dbe..407fe4559b4c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -80,6 +80,7 @@ Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
 Tom Lendacky <thomas.lendacky@amd.com>
 Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
+XiaoyuX Lu <xiaoyux.lu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
 Yu-Chen Lin <yuchenlin@synology.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 12/22] .mailmap: add entry for XiaoyuX Lu

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: XiaoyuX Lu <xiaoyux.lu@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 3866642d4dbe..407fe4559b4c 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -80,6 +80,7 @@ Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
>  Tom Lendacky <thomas.lendacky@amd.com>
>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>  Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
> +XiaoyuX Lu <xiaoyux.lu@intel.com>

I have:

Xiaoyu Lu <xiaoyux.lu@intel.com>

>  Yonghong Zhu <yonghong.zhu@intel.com>
>  Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
>  Yu-Chen Lin <yuchenlin@synology.com>
> 

Re: [PATCH 12/22] .mailmap: add entry for XiaoyuX Lu

[Laszlo Ersek]

On 09/17/20 16:51, Philippe Mathieu-Daudé wrote:
> On 9/7/20 9:30 PM, Laszlo Ersek wrote:
>> ... for git-shortlog purposes.
>>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Cc: XiaoyuX Lu <xiaoyux.lu@intel.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>  .mailmap | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index 3866642d4dbe..407fe4559b4c 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -80,6 +80,7 @@ Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
>>  Tom Lendacky <thomas.lendacky@amd.com>
>>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>>  Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
>> +XiaoyuX Lu <xiaoyux.lu@intel.com>
> 
> I have:
> 
> Xiaoyu Lu <xiaoyux.lu@intel.com>

Right, the X stands for "contractor, not employee", as I understand. I'm
unsure myself if we should include the X in the name...

Oh wait, you are right. We have the following entry in "Maintainers.txt"
(under CryptoPkg):

R: Xiaoyu Lu <xiaoyux.lu@intel.com>

OK, that's evidence that we should *not* include X in the full names.
I'll update all the affected patches.

Thanks!
Laszlo



> 
>>  Yonghong Zhu <yonghong.zhu@intel.com>
>>  Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
>>  Yu-Chen Lin <yuchenlin@synology.com>
>>
> 

[PATCH 13/22] .mailmap: add entry for Steven Shi

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Steven Shi <steven.shi@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 407fe4559b4c..05887373154a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -77,6 +77,7 @@ Shenglei Zhang <shenglei.zhang@intel.com>
 Star Zeng <star.zeng@intel.com>
 Star Zeng <star.zeng@intel.com> <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
 Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
+Steven Shi <steven.shi@intel.com>
 Tom Lendacky <thomas.lendacky@amd.com>
 Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 13/22] .mailmap: add entry for Steven Shi

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Steven Shi <steven.shi@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 407fe4559b4c..05887373154a 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -77,6 +77,7 @@ Shenglei Zhang <shenglei.zhang@intel.com>
>  Star Zeng <star.zeng@intel.com>
>  Star Zeng <star.zeng@intel.com> <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
>  Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
> +Steven Shi <steven.shi@intel.com>
>  Tom Lendacky <thomas.lendacky@amd.com>
>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>  Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

[PATCH 14/22] .mailmap: add entry for Jiaxin Wu

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 05887373154a..0c731e74b811 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,6 +35,7 @@ Hao A Wu <hao.a.wu@intel.com>
 Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>
 Hot Tian <hot.tian@intel.com>
 Hot Tian <hot.tian@intel.com> <hhtian@6f19259b-4bc3-4df7-8a09-765794883524>
+Jiaxin Wu <jiaxin.wu@intel.com>
 Jiewen Yao <jiewen.yao@intel.com>
 Jiewen Yao <jiewen.yao@intel.com> <Jiewen.yao@intel.com>
 Jiewen Yao <jiewen.yao@intel.com> <Jiewen.Yao@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 14/22] .mailmap: add entry for Jiaxin Wu

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 05887373154a..0c731e74b811 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -35,6 +35,7 @@ Hao A Wu <hao.a.wu@intel.com>
>  Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>
>  Hot Tian <hot.tian@intel.com>
>  Hot Tian <hot.tian@intel.com> <hhtian@6f19259b-4bc3-4df7-8a09-765794883524>
> +Jiaxin Wu <jiaxin.wu@intel.com>

Also:

Jiaxin Wu <jiaxin.wu@intel.com> <jiaxinwu@Edk2>

>  Jiewen Yao <jiewen.yao@intel.com>
>  Jiewen Yao <jiewen.yao@intel.com> <Jiewen.yao@intel.com>
>  Jiewen Yao <jiewen.yao@intel.com> <Jiewen.Yao@intel.com>
> 

[PATCH 15/22] .mailmap: add entry for Wei6 Xu

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Wei6 Xu <wei6.xu@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 0c731e74b811..1bdee892fa0c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -82,6 +82,7 @@ Steven Shi <steven.shi@intel.com>
 Tom Lendacky <thomas.lendacky@amd.com>
 Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
+Wei6 Xu <wei6.xu@intel.com>
 XiaoyuX Lu <xiaoyux.lu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 15/22] .mailmap: add entry for Wei6 Xu

[Xu, Wei6]

Hi Laszlo,

Thanks a lot for helping solve this issue.

Reviewed-by: Wei6 Xu <wei6.xu@intel.com>

BR,
Wei

-----Original Message-----
From: Laszlo Ersek <lersek@redhat.com> 
Sent: Tuesday, September 8, 2020 3:31 AM
To: edk2-devel-groups-io <devel@edk2.groups.io>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>; Xu, Wei6 <wei6.xu@intel.com>
Subject: [PATCH 15/22] .mailmap: add entry for Wei6 Xu

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Wei6 Xu <wei6.xu@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 0c731e74b811..1bdee892fa0c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -82,6 +82,7 @@ Steven Shi <steven.shi@intel.com>  Tom Lendacky <thomas.lendacky@amd.com>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
+Wei6 Xu <wei6.xu@intel.com>
 XiaoyuX Lu <xiaoyux.lu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
--
2.19.1.3.g30247aa5d201

Re: [edk2-devel] [PATCH 15/22] .mailmap: add entry for Wei6 Xu

[Philippe Mathieu-Daudé]

Hi Laszlo,

On 9/8/20 3:50 AM, Xu, Wei6 wrote:
> Hi Laszlo,
> 
> Thanks a lot for helping solve this issue.
> 
> Reviewed-by: Wei6 Xu <wei6.xu@intel.com>
> 
> BR,
> Wei

Wei signs as 'Wei', so maybe we should simply use:

Wei Xu <wei6.xu@intel.com>

> 
> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com> 
> Sent: Tuesday, September 8, 2020 3:31 AM
> To: edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>; Xu, Wei6 <wei6.xu@intel.com>
> Subject: [PATCH 15/22] .mailmap: add entry for Wei6 Xu
> 
> ... for git-shortlog purposes.
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Wei6 Xu <wei6.xu@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 0c731e74b811..1bdee892fa0c 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -82,6 +82,7 @@ Steven Shi <steven.shi@intel.com>  Tom Lendacky <thomas.lendacky@amd.com>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>  Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
> +Wei6 Xu <wei6.xu@intel.com>
>  XiaoyuX Lu <xiaoyux.lu@intel.com>
>  Yonghong Zhu <yonghong.zhu@intel.com>
>  Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
> --
> 2.19.1.3.g30247aa5d201
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH 15/22] .mailmap: add entry for Wei6 Xu

[Laszlo Ersek]

On 09/17/20 16:53, Philippe Mathieu-Daudé wrote:
> Hi Laszlo,
> 
> On 9/8/20 3:50 AM, Xu, Wei6 wrote:
>> Hi Laszlo,
>>
>> Thanks a lot for helping solve this issue.
>>
>> Reviewed-by: Wei6 Xu <wei6.xu@intel.com>
>>
>> BR,
>> Wei
> 
> Wei signs as 'Wei', so maybe we should simply use:
> 
> Wei Xu <wei6.xu@intel.com>

In this case I disagree, I think:

- just above, Wei gave an R-b as "Wei6 Xu"

- in Maintainers.txt, we find (under FmpDevicePkg):

R: Wei6 Xu <wei6.xu@intel.com>

Thanks
Laszlo

> 
>>
>> -----Original Message-----
>> From: Laszlo Ersek <lersek@redhat.com> 
>> Sent: Tuesday, September 8, 2020 3:31 AM
>> To: edk2-devel-groups-io <devel@edk2.groups.io>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>; Xu, Wei6 <wei6.xu@intel.com>
>> Subject: [PATCH 15/22] .mailmap: add entry for Wei6 Xu
>>
>> ... for git-shortlog purposes.
>>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Cc: Wei6 Xu <wei6.xu@intel.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>  .mailmap | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index 0c731e74b811..1bdee892fa0c 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -82,6 +82,7 @@ Steven Shi <steven.shi@intel.com>  Tom Lendacky <thomas.lendacky@amd.com>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>>  Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
>> +Wei6 Xu <wei6.xu@intel.com>
>>  XiaoyuX Lu <xiaoyux.lu@intel.com>
>>  Yonghong Zhu <yonghong.zhu@intel.com>
>>  Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
>> --
>> 2.19.1.3.g30247aa5d201
>>
>>
>>
>> 
>>
> 

Re: [edk2-devel] [PATCH 15/22] .mailmap: add entry for Wei6 Xu

[Philippe Mathieu-Daudé]

On 9/17/20 5:51 PM, Laszlo Ersek wrote:
> On 09/17/20 16:53, Philippe Mathieu-Daudé wrote:
>> Hi Laszlo,
>>
>> On 9/8/20 3:50 AM, Xu, Wei6 wrote:
>>> Hi Laszlo,
>>>
>>> Thanks a lot for helping solve this issue.
>>>
>>> Reviewed-by: Wei6 Xu <wei6.xu@intel.com>
>>>
>>> BR,
>>> Wei
>>
>> Wei signs as 'Wei', so maybe we should simply use:
>>
>> Wei Xu <wei6.xu@intel.com>
> 
> In this case I disagree, I think:
> 
> - just above, Wei gave an R-b as "Wei6 Xu"
> 
> - in Maintainers.txt, we find (under FmpDevicePkg):
> 
> R: Wei6 Xu <wei6.xu@intel.com>

Sure, no problem.

> 
> Thanks
> Laszlo
> 
>>
>>>
>>> -----Original Message-----
>>> From: Laszlo Ersek <lersek@redhat.com> 
>>> Sent: Tuesday, September 8, 2020 3:31 AM
>>> To: edk2-devel-groups-io <devel@edk2.groups.io>
>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>; Xu, Wei6 <wei6.xu@intel.com>
>>> Subject: [PATCH 15/22] .mailmap: add entry for Wei6 Xu
>>>
>>> ... for git-shortlog purposes.
>>>
>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> Cc: Wei6 Xu <wei6.xu@intel.com>
>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>>> ---
>>>  .mailmap | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/.mailmap b/.mailmap
>>> index 0c731e74b811..1bdee892fa0c 100644
>>> --- a/.mailmap
>>> +++ b/.mailmap
>>> @@ -82,6 +82,7 @@ Steven Shi <steven.shi@intel.com>  Tom Lendacky <thomas.lendacky@amd.com>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>>>  Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
>>> +Wei6 Xu <wei6.xu@intel.com>
>>>  XiaoyuX Lu <xiaoyux.lu@intel.com>
>>>  Yonghong Zhu <yonghong.zhu@intel.com>
>>>  Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
>>> --
>>> 2.19.1.3.g30247aa5d201
>>>
>>>
>>>
>>> 
>>>
>>
> 

[PATCH 16/22] .mailmap: add entry for Qi Zhang

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Qi Zhang <qi1.zhang@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 1bdee892fa0c..ad593704a1d4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,6 +65,7 @@ Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25S
 Ming Tan <ming.tan@intel.com>
 Nikolai Saoukh <nms@otdel-1.org>
 Philippe Mathieu-Daudé <philmd@redhat.com>
+Qi Zhang <qi1.zhang@intel.com>
 Ray Ni <ray.ni@intel.com>
 Ray Ni <ray.ni@intel.com> <C:/Program Files (x86)/Git/O=Intel/OU=Pacifica02/cn=Recipients/cn=rni2>
 Ray Ni <ray.ni@intel.com> <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524>
-- 
2.19.1.3.g30247aa5d201

[PATCH 17/22] .mailmap: add entry for Matt DeVillier

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Matt DeVillier <matt.devillier@gmail.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index ad593704a1d4..33652b8f0b46 100644
--- a/.mailmap
+++ b/.mailmap
@@ -58,6 +58,7 @@ Marc W Chen <marc.w.chen@intel.com>
 Marvin Häuser <Marvin.Haeuser@outlook.com>
 Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>
 Marvin Häuser <mhaeuser@outlook.de>
+Matt DeVillier <matt.devillier@gmail.com>
 Maurice Ma <maurice.ma@intel.com>
 Michael D Kinney <michael.d.kinney@intel.com>
 Michael Kubacki <michael.a.kubacki@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 17/22] .mailmap: add entry for Matt DeVillier

[MrChromebox]

Acked-by Matt DeVillier <matt.devillier@gmail.com>

On Mon, Sep 7, 2020 at 2:31 PM Laszlo Ersek <lersek@redhat.com> wrote:
>
> ... for git-shortlog purposes.
>
> Cc: Matt DeVillier <matt.devillier@gmail.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/.mailmap b/.mailmap
> index ad593704a1d4..33652b8f0b46 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -58,6 +58,7 @@ Marc W Chen <marc.w.chen@intel.com>
>  Marvin Häuser <Marvin.Haeuser@outlook.com>
>  Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>
>  Marvin Häuser <mhaeuser@outlook.de>
> +Matt DeVillier <matt.devillier@gmail.com>
>  Maurice Ma <maurice.ma@intel.com>
>  Michael D Kinney <michael.d.kinney@intel.com>
>  Michael Kubacki <michael.a.kubacki@intel.com>
> --
> 2.19.1.3.g30247aa5d201
>
>

[PATCH 18/22] .mailmap: add entry for Paul Grimes

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Paul Grimes <paul.grimes@amd.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 33652b8f0b46..93431e6cd975 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,6 +65,7 @@ Michael Kubacki <michael.a.kubacki@intel.com>
 Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=3c8b0226e75f4ab08d20c151cb7a8a72>
 Ming Tan <ming.tan@intel.com>
 Nikolai Saoukh <nms@otdel-1.org>
+Paul Grimes <paul.grimes@amd.com>
 Philippe Mathieu-Daudé <philmd@redhat.com>
 Qi Zhang <qi1.zhang@intel.com>
 Ray Ni <ray.ni@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 18/22] .mailmap: add entry for Paul Grimes

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Paul Grimes <paul.grimes@amd.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 33652b8f0b46..93431e6cd975 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -65,6 +65,7 @@ Michael Kubacki <michael.a.kubacki@intel.com>
>  Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=3c8b0226e75f4ab08d20c151cb7a8a72>
>  Ming Tan <ming.tan@intel.com>
>  Nikolai Saoukh <nms@otdel-1.org>
> +Paul Grimes <paul.grimes@amd.com>

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

>  Philippe Mathieu-Daudé <philmd@redhat.com>
>  Qi Zhang <qi1.zhang@intel.com>
>  Ray Ni <ray.ni@intel.com>
> 

[PATCH 19/22] .mailmap: add (another) entry for Vladimir Olovyannikov

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 93431e6cd975..6c523a1bb79d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -85,6 +85,7 @@ Steven Shi <steven.shi@intel.com>
 Tom Lendacky <thomas.lendacky@amd.com>
 Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
+Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via groups.io <vladimir.olovyannikov=broadcom.com@groups.io>
 Wei6 Xu <wei6.xu@intel.com>
 XiaoyuX Lu <xiaoyux.lu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 19/22] .mailmap: add (another) entry for Vladimir Olovyannikov

[Philippe Mathieu-Daudé]

On 9/7/20 9:30 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 93431e6cd975..6c523a1bb79d 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -85,6 +85,7 @@ Steven Shi <steven.shi@intel.com>
>  Tom Lendacky <thomas.lendacky@amd.com>
>  Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
>  Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
> +Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via groups.io <vladimir.olovyannikov=broadcom.com@groups.io>

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

>  Wei6 Xu <wei6.xu@intel.com>
>  XiaoyuX Lu <xiaoyux.lu@intel.com>
>  Yonghong Zhu <yonghong.zhu@intel.com>
> 

[PATCH 20/22] .mailmap: add (another) entry for Liming Gao

[Laszlo Ersek]

... for git-shortlog purposes.

NOTE: this patch does not introduce a cross-domain mapping; it only maps
the name "gaoliming" in Liming's new email address to "Liming Gao" (see
the Author field on commit aad9cba85fb7).

Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 6c523a1bb79d..f7b2f524d24a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -46,6 +46,7 @@ Jim Dailey <Jim.Dailey@Dell.com>
 Jim Dailey <Jim.Dailey@Dell.com> <Jim_Dailey@Dell.com>
 Laszlo Ersek <lersek@redhat.com> <lersek@6f19259b-4bc3-4df7-8a09-765794883524>
 Laszlo Ersek <lersek@redhat.com> <lersek@Edk2>
+Liming Gao <gaoliming@byosoft.com.cn>
 Liming Gao <liming.gao@intel.com> <Gao, Liming liming.gao@intel.com>
 Liming Gao <liming.gao@intel.com> <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
 Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
-- 
2.19.1.3.g30247aa5d201

回复: [PATCH 20/22] .mailmap: add (another) entry for Liming Gao

[gaoliming]

Laszlo:
  Thanks for your update. Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

Thanks
Liming
> -----邮件原件-----
> 发件人: Laszlo Ersek <lersek@redhat.com>
> 发送时间: 2020年9月8日 3:31
> 收件人: edk2-devel-groups-io <devel@edk2.groups.io>
> 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Philippe Mathieu-Daudé
> <philmd@redhat.com>
> 主题: [PATCH 20/22] .mailmap: add (another) entry for Liming Gao
> 
> ... for git-shortlog purposes.
> 
> NOTE: this patch does not introduce a cross-domain mapping; it only maps
> the name "gaoliming" in Liming's new email address to "Liming Gao" (see
> the Author field on commit aad9cba85fb7).
> 
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 6c523a1bb79d..f7b2f524d24a 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -46,6 +46,7 @@ Jim Dailey <Jim.Dailey@Dell.com>
>  Jim Dailey <Jim.Dailey@Dell.com> <Jim_Dailey@Dell.com>
>  Laszlo Ersek <lersek@redhat.com>
> <lersek@6f19259b-4bc3-4df7-8a09-765794883524>
>  Laszlo Ersek <lersek@redhat.com> <lersek@Edk2>
> +Liming Gao <gaoliming@byosoft.com.cn>
>  Liming Gao <liming.gao@intel.com> <Gao, Liming liming.gao@intel.com>
>  Liming Gao <liming.gao@intel.com>
> <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
>  Liming Gao <liming.gao@intel.com> <lgao4@Edk2>
> --
> 2.19.1.3.g30247aa5d201
> 

[PATCH 21/22] .mailmap: add entry for Kun Qin

[Laszlo Ersek]

... for git-shortlog purposes.

Cc: Kun Qin <kuqin@microsoft.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index f7b2f524d24a..e6587ae6f54c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -44,6 +44,7 @@ Jiewen Yao <jiewen.yao@intel.com> <jyao1@6f19259b-4bc3-4df7-8a09-765794883524>
 Jiewen Yao <jiewen.yao@intel.com> <jyao1@Edk2>
 Jim Dailey <Jim.Dailey@Dell.com>
 Jim Dailey <Jim.Dailey@Dell.com> <Jim_Dailey@Dell.com>
+Kun Qin <kuqin@microsoft.com>
 Laszlo Ersek <lersek@redhat.com> <lersek@6f19259b-4bc3-4df7-8a09-765794883524>
 Laszlo Ersek <lersek@redhat.com> <lersek@Edk2>
 Liming Gao <gaoliming@byosoft.com.cn>
-- 
2.19.1.3.g30247aa5d201

[PATCH 22/22] .mailmap: add entries for Rebecca Cran

[Laszlo Ersek]

... for git-shortlog purposes.

NOTE: this patch does not introduce a cross-domain mapping; it only maps
both email addresses of Rebecca to the full name "Rebecca Cran".

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index e6587ae6f54c..739c644f0c0a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -77,6 +77,8 @@ Ray Ni <ray.ni@intel.com> <niruiyu@Edk2>
 Ray Ni <ray.ni@intel.com> <ruiyu.ni@intel.com>
 Ray Ni <ray.ni@intel.com> <Ruiyu.ni@Intel.com>
 Ray Ni <ray.ni@intel.com> <ruyu.ni@intel.com>
+Rebecca Cran <rebecca@bluestop.org>
+Rebecca Cran <rebecca@bsdio.com>
 Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <elhaj@hpe.com>
 Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <Samer El-Haj-Mahmoud elhaj@hp.com>
 Shenglei Zhang <shenglei.zhang@intel.com>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 22/22] .mailmap: add entries for Rebecca Cran

[Rebecca Cran]

On 9/7/20 1:31 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
>
> NOTE: this patch does not introduce a cross-domain mapping; it only maps
> both email addresses of Rebecca to the full name "Rebecca Cran".

I'm no longer using the bluestop.org email address for EDK2 mail, but 
since I'll be working on UEFI for my new job, it might be worth adding 
it instead:


rebecca@nuviainc.com


-- 
Rebecca Cran

Re: [PATCH 22/22] .mailmap: add entries for Rebecca Cran

[Laszlo Ersek]

Hello Rebecca,

On 09/08/20 00:15, Rebecca Cran wrote:
> On 9/7/20 1:31 PM, Laszlo Ersek wrote:
>> ... for git-shortlog purposes.
>>
>> NOTE: this patch does not introduce a cross-domain mapping; it only
>> maps both email addresses of Rebecca to the full name "Rebecca Cran".
>
> I'm no longer using the bluestop.org email address for EDK2 mail,

That's irrelevant for the purpose of this patch series -- it targets
commits that you contributed in the past. When checking a git-shortlog
for a particular commit range, if you have contributed during that time
from multiple email addresses, it's strongly preferable to collect them
all under your real name Rebecca Cran.

Consider the following command:

$ git shortlog edk2-stable201905..edk2-stable202008

Without this patch (set), it prints (excerpt):

> Rebecca Cran (15):
>       OvmfPkg/build.sh: enable multitheaded build by default
>       OvmfPkg/build.sh: remove $ADD_QEMU_HDA
>       OvmfPkg/build.sh: use newer '-drive if=pflash' syntax when running qemu
>       OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones
>       OvmfPkg: Add bhyve support into AcpiTimerLib
>       OvmfPkg: Add VBE2 mode info structure to LegacyVgaBios.h
>       OvmfPkg: Add QemuFwCfgLibNull
>       OvmfPkg: Add BaseResetSystemLibBhyve
>       BaseTools: add repo name option to SetupGit.py
>       ShellPkg: smbiosview - print field values as unsigned integers
>       BaseTools: Update ReadMe.txt to match current functionality
>       BaseTools: rename ReadMe.txt to ReadMe.rst
>       Add BhyvePkg, to support the bhyve hypervisor
>       Maintainers.txt: Add bhyve reviewers
>       OvmfPkg/Bhyve: rename files to remove 'Pkg' infix
>
> rebecca@bluestop.org (1):
>       Fix indentation in edksetup.sh SetupPython3
>
> rebecca@bsdio.com (5):
>       edksetup.sh: Use bash variable $PWD instead of executing pwd command
>       edksetup.sh: Use $SCRIPTNAME consistently instead of 'edksetup.sh'
>       edksetup.sh: when executing arithmetic commands, $ isn't needed
>       edksetup.sh: remove redundant -?, -h and --help in options parsing
>       OvmfPkg/build.sh: remove literal carriage return

With this patch, it prints:

> Rebecca Cran (21):
>       Fix indentation in edksetup.sh SetupPython3
>       edksetup.sh: Use bash variable $PWD instead of executing pwd command
>       edksetup.sh: Use $SCRIPTNAME consistently instead of 'edksetup.sh'
>       edksetup.sh: when executing arithmetic commands, $ isn't needed
>       edksetup.sh: remove redundant -?, -h and --help in options parsing
>       OvmfPkg/build.sh: enable multitheaded build by default
>       OvmfPkg/build.sh: remove literal carriage return
>       OvmfPkg/build.sh: remove $ADD_QEMU_HDA
>       OvmfPkg/build.sh: use newer '-drive if=pflash' syntax when running qemu
>       OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones
>       OvmfPkg: Add bhyve support into AcpiTimerLib
>       OvmfPkg: Add VBE2 mode info structure to LegacyVgaBios.h
>       OvmfPkg: Add QemuFwCfgLibNull
>       OvmfPkg: Add BaseResetSystemLibBhyve
>       BaseTools: add repo name option to SetupGit.py
>       ShellPkg: smbiosview - print field values as unsigned integers
>       BaseTools: Update ReadMe.txt to match current functionality
>       BaseTools: rename ReadMe.txt to ReadMe.rst
>       Add BhyvePkg, to support the bhyve hypervisor
>       Maintainers.txt: Add bhyve reviewers
>       OvmfPkg/Bhyve: rename files to remove 'Pkg' infix

Unless you prefer the former output, please ACK this patch.

(Note that this mapping is not cross-domain, as it simply maps different
(possibly historical) email addresses of yours to your real name.
Cross-domain mapping would be if we replaced an *email address* with
another, when displaying the commit log (such as "git-log
--use-mailmap"). That is also possible  with mailmap, but not what we're
doing here.)

> but since I'll be working on UEFI for my new job, it might be worth
> adding it instead:
>
>
> rebecca@nuviainc.com

This is certainly useful -- in addition to the present patch.

I can respin this one patch later, or we can add your @nuviainc.com
email address separately, later on.

(NB your entry in Maintainers.txt still says <rebecca@bsdio.com>; please
consider updating that if necessary.)

Thanks!
Laszlo

Re: [edk2-devel] [PATCH 22/22] .mailmap: add entries for Rebecca Cran

[Rebecca Cran]

On 9/8/20 2:08 AM, Laszlo Ersek wrote:

> That's irrelevant for the purpose of this patch series -- it targets
> commits that you contributed in the past. When checking a git-shortlog
> for a particular commit range, if you have contributed during that time
> from multiple email addresses, it's strongly preferable to collect them
> all under your real name Rebecca Cran.

Ah, ok sorry I hadn't realized.

> Unless you prefer the former output, please ACK this patch.

Acked-by: Rebecca Cran <rebecca@bsdio.com>

> I can respin this one patch later, or we can add your @nuviainc.com
> email address separately, later on.
>
> (NB your entry in Maintainers.txt still says <rebecca@bsdio.com>; please
> consider updating that if necessary.)

Thanks. I'm currently expecting my bhyve work to remain under my 
personal email address.


-- 
Rebecca Cran

Re: [edk2-devel] [PATCH 22/22] .mailmap: add entries for Rebecca Cran

[Laszlo Ersek]

On 09/08/20 16:40, Rebecca Cran wrote:
> On 9/8/20 2:08 AM, Laszlo Ersek wrote:
> 
>> That's irrelevant for the purpose of this patch series -- it targets
>> commits that you contributed in the past. When checking a git-shortlog
>> for a particular commit range, if you have contributed during that time
>> from multiple email addresses, it's strongly preferable to collect them
>> all under your real name Rebecca Cran.
> 
> Ah, ok sorry I hadn't realized.
> 
>> Unless you prefer the former output, please ACK this patch.
> 
> Acked-by: Rebecca Cran <rebecca@bsdio.com>
> 
>> I can respin this one patch later, or we can add your @nuviainc.com
>> email address separately, later on.
>>
>> (NB your entry in Maintainers.txt still says <rebecca@bsdio.com>; please
>> consider updating that if necessary.)
> 
> Thanks. I'm currently expecting my bhyve work to remain under my
> personal email address.
> 
> 

Thanks!
Laszlo

Re: [PATCH 22/22] .mailmap: add entries for Rebecca Cran

[Philippe Mathieu-Daudé]

On 9/7/20 9:31 PM, Laszlo Ersek wrote:
> ... for git-shortlog purposes.
> 
> NOTE: this patch does not introduce a cross-domain mapping; it only maps
> both email addresses of Rebecca to the full name "Rebecca Cran".
> 
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  .mailmap | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index e6587ae6f54c..739c644f0c0a 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -77,6 +77,8 @@ Ray Ni <ray.ni@intel.com> <niruiyu@Edk2>
>  Ray Ni <ray.ni@intel.com> <ruiyu.ni@intel.com>
>  Ray Ni <ray.ni@intel.com> <Ruiyu.ni@Intel.com>
>  Ray Ni <ray.ni@intel.com> <ruyu.ni@intel.com>
> +Rebecca Cran <rebecca@bluestop.org>
> +Rebecca Cran <rebecca@bsdio.com>

Also:

Rebecca Cran <rebecca@bluestop.org> <rebecca=bluestop.org@groups.io>
Rebecca Cran <rebecca@bluestop.org> Rebecca Cran via edk2-devel
<edk2-devel@lists.01.org>

>  Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <elhaj@hpe.com>
>  Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <Samer El-Haj-Mahmoud elhaj@hp.com>
>  Shenglei Zhang <shenglei.zhang@intel.com>
> 

Re: [PATCH 22/22] .mailmap: add entries for Rebecca Cran

[Laszlo Ersek]

On 09/17/20 16:56, Philippe Mathieu-Daudé wrote:
> On 9/7/20 9:31 PM, Laszlo Ersek wrote:
>> ... for git-shortlog purposes.
>>
>> NOTE: this patch does not introduce a cross-domain mapping; it only maps
>> both email addresses of Rebecca to the full name "Rebecca Cran".
>>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Cc: Rebecca Cran <rebecca@bsdio.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>  .mailmap | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index e6587ae6f54c..739c644f0c0a 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -77,6 +77,8 @@ Ray Ni <ray.ni@intel.com> <niruiyu@Edk2>
>>  Ray Ni <ray.ni@intel.com> <ruiyu.ni@intel.com>
>>  Ray Ni <ray.ni@intel.com> <Ruiyu.ni@Intel.com>
>>  Ray Ni <ray.ni@intel.com> <ruyu.ni@intel.com>
>> +Rebecca Cran <rebecca@bluestop.org>
>> +Rebecca Cran <rebecca@bsdio.com>
> 
> Also:
> 
> Rebecca Cran <rebecca@bluestop.org> <rebecca=bluestop.org@groups.io>
> Rebecca Cran <rebecca@bluestop.org> Rebecca Cran via edk2-devel
> <edk2-devel@lists.01.org>
> 
>>  Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <elhaj@hpe.com>
>>  Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <Samer El-Haj-Mahmoud elhaj@hp.com>
>>  Shenglei Zhang <shenglei.zhang@intel.com>
>>
> 

Thanks!
Laszlo

Re: [edk2-devel] [PATCH 00/22] .mailmap: add mappings after edk2-stable202008

[Laszlo Ersek]

Hi Andrew, Leif,

On 09/07/20 21:30, Laszlo Ersek wrote:
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: update_mailmap_edk2stable202008
> 
> If you (singular) are on the CC list of this email (and you are not
> Phil), then the output of the following command:
> 
> $ git shortlog edk2-stable201905..edk2-stable202008
> 
> prints something dubious in relation to you. For example, you could be
> listed under two different names, or your name might not appear to be
> your real name (per "Developer Certificate of Origin" in "ReadMe.rst").
> 
> The patch that you receive in addition to this blurb seeks to solve that
> particular issue. Please (a) run the above git-shortlog command and save
> the output, (b) apply (or fetch) this series, (c) re-run the
> git-shortlog command, (d) if you are OK with the differences related to
> your name, please respond with an Acked-by or Reviewed-by to the
> specific patch.
> 
> Importantly, cross-domain mappings are NOT introduced, so if there's no
> feedback from you in a week or so, we can merge the patch anyway (with
> steward approval).

I posted this series more than a week ago -- I've only received sporadic
feedback since then. I think I should go ahead with merging this series.
Or do you suggest we wait until Mike can check?

Thanks
Laszlo

> 
> Thanks,
> Laszlo
> 
> Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
> Cc: Derek Lin <derek.lin2@hpe.com>
> Cc: Eric Jin <eric.jin@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Kun Qin <kuqin@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Maggie Chu <maggie.chu@intel.com>
> Cc: Marc W Chen <marc.w.chen@intel.com>
> Cc: Matt DeVillier <matt.devillier@gmail.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Paul Grimes <paul.grimes@amd.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Steven Shi <steven.shi@intel.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
> Cc: Wei6 Xu <wei6.xu@intel.com>
> Cc: XiaoyuX Lu <xiaoyux.lu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> 
> Laszlo Ersek (22):
>   .mailmap: add entry for Marc W Chen
>   .mailmap: add entry for Ching JenX Cheng
>   .mailmap: add entries for Maggie Chu
>   .mailmap: add entries for Guo Dong
>   .mailmap: add entry for Zhichao Gao
>   .mailmap: add entries for Guomin Jiang
>   .mailmap: add entry for Eric Jin
>   .mailmap: add entry for Michael D Kinney
>   .mailmap: add entry for Tom Lendacky
>   .mailmap: add entry for Derek Lin
>   .mailmap: add entry for Zhiguang Liu
>   .mailmap: add entry for XiaoyuX Lu
>   .mailmap: add entry for Steven Shi
>   .mailmap: add entry for Jiaxin Wu
>   .mailmap: add entry for Wei6 Xu
>   .mailmap: add entry for Qi Zhang
>   .mailmap: add entry for Matt DeVillier
>   .mailmap: add entry for Paul Grimes
>   .mailmap: add (another) entry for Vladimir Olovyannikov
>   .mailmap: add (another) entry for Liming Gao
>   .mailmap: add entry for Kun Qin
>   .mailmap: add entries for Rebecca Cran
> 
>  .mailmap | 26 ++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 

Re: [edk2-devel] [PATCH 00/22] .mailmap: add mappings after edk2-stable202008

[Laszlo Ersek]

On 09/07/20 21:30, Laszlo Ersek wrote:
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: update_mailmap_edk2stable202008
> 
> If you (singular) are on the CC list of this email (and you are not
> Phil), then the output of the following command:
> 
> $ git shortlog edk2-stable201905..edk2-stable202008
> 
> prints something dubious in relation to you. For example, you could be
> listed under two different names, or your name might not appear to be
> your real name (per "Developer Certificate of Origin" in "ReadMe.rst").
> 
> The patch that you receive in addition to this blurb seeks to solve that
> particular issue. Please (a) run the above git-shortlog command and save
> the output, (b) apply (or fetch) this series, (c) re-run the
> git-shortlog command, (d) if you are OK with the differences related to
> your name, please respond with an Acked-by or Reviewed-by to the
> specific patch.
> 
> Importantly, cross-domain mappings are NOT introduced, so if there's no
> feedback from you in a week or so, we can merge the patch anyway (with
> steward approval).
> 
> Thanks,
> Laszlo
> 
> Cc: Ching JenX Cheng <ching.jenx.cheng@intel.com>
> Cc: Derek Lin <derek.lin2@hpe.com>
> Cc: Eric Jin <eric.jin@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Kun Qin <kuqin@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Maggie Chu <maggie.chu@intel.com>
> Cc: Marc W Chen <marc.w.chen@intel.com>
> Cc: Matt DeVillier <matt.devillier@gmail.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Paul Grimes <paul.grimes@amd.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Steven Shi <steven.shi@intel.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
> Cc: Wei6 Xu <wei6.xu@intel.com>
> Cc: XiaoyuX Lu <xiaoyux.lu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> 
> Laszlo Ersek (22):
>   .mailmap: add entry for Marc W Chen
>   .mailmap: add entry for Ching JenX Cheng
>   .mailmap: add entries for Maggie Chu
>   .mailmap: add entries for Guo Dong
>   .mailmap: add entry for Zhichao Gao
>   .mailmap: add entries for Guomin Jiang
>   .mailmap: add entry for Eric Jin
>   .mailmap: add entry for Michael D Kinney
>   .mailmap: add entry for Tom Lendacky
>   .mailmap: add entry for Derek Lin
>   .mailmap: add entry for Zhiguang Liu
>   .mailmap: add entry for XiaoyuX Lu
>   .mailmap: add entry for Steven Shi
>   .mailmap: add entry for Jiaxin Wu
>   .mailmap: add entry for Wei6 Xu
>   .mailmap: add entry for Qi Zhang
>   .mailmap: add entry for Matt DeVillier
>   .mailmap: add entry for Paul Grimes
>   .mailmap: add (another) entry for Vladimir Olovyannikov
>   .mailmap: add (another) entry for Liming Gao
>   .mailmap: add entry for Kun Qin
>   .mailmap: add entries for Rebecca Cran
> 
>  .mailmap | 26 ++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 

Merged the following patches:

[edk2-devel] [PATCH 05/22] .mailmap: add entry for Zhichao Gao
[edk2-devel] [PATCH 09/22] .mailmap: add entry for Tom Lendacky
[edk2-devel] [PATCH 11/22] .mailmap: add entry for Zhiguang Liu
[edk2-devel] [PATCH 15/22] .mailmap: add entry for Wei6 Xu
[edk2-devel] [PATCH 17/22] .mailmap: add entry for Matt DeVillier
[edk2-devel] [PATCH 20/22] .mailmap: add (another) entry for Liming Gao
[edk2-devel] [PATCH 22/22] .mailmap: add entries for Rebecca Cran

as commit range ea9af51479fe..fb97626fe047, via <https://github.com/tianocore/edk2/pull/946>.

Thanks
Laszlo