[PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history

[PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history

[Philippe Mathieu-Daudé]

The .mailmap git feature helps fixing commit mistakes (in name/email).

The easiest way to use it is with the --use-mailmap flag:

  $ git log --use-mailmap

See documentation [1] and [2], and interesting blog [3].

Laszlo replied [4] to v1 explaining stewards want to avoid avoid
cross-domain mapping, and suggested to split in per email-address
patches, so contributors can individually Ack/Nack.

This v3 collects the patches of the 30 developers who replied to
the v2 [5] with their R-b tag.  There is an exception with patch

I dropped the unreviewed patches and am cc'ing this series to the
Tianocore stewards, as suggested by Laszlo in [6]. Each developer
will still be Cc'ed in case a modification was requested, he/her
can verify.

This series is available at:
https://gitlab.com/philmd/edk2/commits/mailmap-v3

Regards,

Phil.

[1] https://git-scm.com/docs/git-shortlog#_mapping_authors
[2] https://git-scm.com/docs/git-check-mailmap#_mapping_authors
[3] https://github.com/sympy/sympy/wiki/Using-.mailmap#making-mailmap-entries
[4] https://edk2.groups.io/g/devel/message/51657
[5] https://edk2.groups.io/g/devel/message/51834
[6] https://edk2.groups.io/g/devel/message/51906

Cc: Andrew Fish <afish@apple.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Philippe Mathieu-Daudé (32):
  .mailmap: Add a stub with documentation
  .mailmap: Add an entry for Aaron Li
  .mailmap: Add an entry for Antoine Cœur
  .mailmap: Add an entry for Ard Biesheuvel
  .mailmap: Add an entry for Ashley DeSimone
  .mailmap: Add an entry for Baraneedharan Anbazhagan
  .mailmap: Add an entry for Chasel Chiu
  .mailmap: Add an entry for Christopher J Zurcher
  .mailmap: Add an entry for Eric Dong
  .mailmap: Add an entry for Erik Bjorge
  .mailmap: Add an entry for Hao Wu
  .mailmap: Add an entry for Hot Tian
  .mailmap: Add an entry for Jiewen Yao
  .mailmap: Add an entry for Jim Dailey
  .mailmap: Add an entry for Laszlo Ersek
  .mailmap: Add an entry for Liming Gao
  .mailmap: Add an entry for Maciej Rabeda
  .mailmap: Add an entry for Marc-André Lureau
  .mailmap: Add an entry for Marvin Häuser
  .mailmap: Add an entry for Maurice Ma
  .mailmap: Add an entry for Michael Kubacki
  .mailmap: Add an entry for Ming Tan
  .mailmap: Add an entry for Nikolai Saoukh
  .mailmap: Add an entry for Philippe Mathieu-Daudé
  .mailmap: Add an entry for Ray Ni
  .mailmap: Add an entry for Samer El-Haj-Mahmoud
  .mailmap: Add an entry for Shenglei Zhang
  .mailmap: Add an entry for Star Zeng
  .mailmap: Add an entry for Vitaly Cheptsov
  .mailmap: Add an entry for Vladimir Olovyannikov
  .mailmap: Add an entry for Yonghong Zhu
  .mailmap: Add an entry for Yu-Chen Lin

 .mailmap | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .mailmap

-- 
2.21.0

[PATCH v3 01/32] .mailmap: Add a stub with documentation

[Philippe Mathieu-Daudé]

The .mailmap git feature helps fixing commit mistakes (in name/email).

The easiest way to use it is with the --use-mailmap flag:

  $ git log --use-mailmap

See:
* https://git-scm.com/docs/git-shortlog#_mapping_authors
* https://git-scm.com/docs/git-check-mailmap#_mapping_authors

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..6d88189a58d4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,11 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed.
+#
+# Please keep this file sorted alphabetically, and email in lowercase.
+# The format used is:
+#
+#   Firstname Lastname <email@domain.tld>
+#
-- 
2.21.0

[PATCH v3 02/32] .mailmap: Add an entry for Aaron Li

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Aaron Li to have his/her name and email address
displayed properly in the git history.

Cc: Aaron Li <aaron.li@intel.com>
Cc: Songpeng Li <songpeng.li@intel.com>
Reviewed-by: Aaron Li <aaron.li@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 6d88189a58d4..595ce337714b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,3 +9,5 @@
 #
 #   Firstname Lastname <email@domain.tld>
 #
+
+Aaron Li <aaron.li@intel.com> <songpeng.li@intel.com>
-- 
2.21.0

[PATCH v3 03/32] .mailmap: Add an entry for Antoine Cœur

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Antoine Cœur to have his/her name and email
address displayed properly in the git history.

Cc: Antoine Cœur <coeur@gmx.fr>
Reviewed-by: Antoine Cœur<coeur@gmx.fr>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 595ce337714b..03ed977984b5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,3 +11,5 @@
 #
 
 Aaron Li <aaron.li@intel.com> <songpeng.li@intel.com>
+Antoine Cœur <coeur@gmx.fr>
+Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
-- 
2.21.0

[PATCH v3 04/32] .mailmap: Add an entry for Ard Biesheuvel

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Ard Biesheuvel to have his/her name and email
address displayed properly in the git history.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 03ed977984b5..491fcffeb95f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,3 +13,4 @@
 Aaron Li <aaron.li@intel.com> <songpeng.li@intel.com>
 Antoine Cœur <coeur@gmx.fr>
 Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
+Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
-- 
2.21.0

[PATCH v3 05/32] .mailmap: Add an entry for Ashley DeSimone

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Ashley DeSimone to have his/her name and email
address displayed properly in the git history.

Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 491fcffeb95f..d054b07effaa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,3 +14,4 @@ Aaron Li <aaron.li@intel.com> <songpeng.li@intel.com>
 Antoine Cœur <coeur@gmx.fr>
 Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
 Ard Biesheuvel <ard.biesheuvel@linaro.org> <abiesheuvel@Edk2>
+Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a09-765794883524>
-- 
2.21.0

[PATCH v3 06/32] .mailmap: Add an entry for Baraneedharan Anbazhagan

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Baraneedharan Anbazhagan to have his/her name
and email address displayed properly in the git history.

Cc: Baraneedharan Anbazhagan <anbazhagan@hp.com>
Reviewed-by: Baraneedharan Anbazhagan <anbazhagan@hp.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index d054b07effaa..35fbb78c6b43 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,3 +15,4 @@ Antoine Cœur <coeur@gmx.fr>
 Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
 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>
-- 
2.21.0

[PATCH v3 07/32] .mailmap: Add an entry for Chasel Chiu

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Chasel Chiu to have his/her name and email
address displayed properly in the git history.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 35fbb78c6b43..8f351b59ea76 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,3 +16,4 @@ Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
 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>
-- 
2.21.0

[PATCH v3 08/32] .mailmap: Add an entry for Christopher J Zurcher

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Christopher J Zurcher to have his/her name and
email address displayed properly in the git history.

Cc: Christopher J Zurcher <christopher.j.zurcher@intel.com>
Reviewed-by: Christopher J Zurcher <christopher.j.zurcher@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 8f351b59ea76..b05d1501e185 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,3 +17,4 @@ 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>
+Christopher J Zurcher <christopher.j.zurcher@intel.com>
-- 
2.21.0

[PATCH v3 09/32] .mailmap: Add an entry for Eric Dong

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Eric Dong to have his/her name and email
address displayed properly in the git history.

Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index b05d1501e185..28c01bdfcd70 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,3 +18,7 @@ Ashley DeSimone <ashley.e.desimone@intel.com> <ashdesimone@6f19259b-4bc3-4df7-8a
 Baraneedharan Anbazhagan <anbazhagan@hp.com>
 Chasel Chiu <chasel.chiu@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>
+Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
+Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
-- 
2.21.0

[PATCH v3 10/32] .mailmap: Add an entry for Erik Bjorge

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Erik Bjorge to have his/her name and email
address displayed properly in the git history.

Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 28c01bdfcd70..732d7a99f845 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,3 +22,4 @@ 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>
+Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
-- 
2.21.0

[PATCH v3 11/32] .mailmap: Add an entry for Hao Wu

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Hao Wu to have his/her name and email address
displayed properly in the git history.

Cc: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 732d7a99f845..cc94d92461c2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -23,3 +23,5 @@ 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>
 Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
+Hao A Wu <hao.a.wu@intel.com>
+Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>
-- 
2.21.0

[PATCH v3 12/32] .mailmap: Add an entry for Hot Tian

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Hot Tian to have his/her name and email address
displayed properly in the git history.

Cc: Hot Tian <hot.tian@intel.com>
Reviewed-by: Hot Tian <hot.tian@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index cc94d92461c2..82d202841d94 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,3 +25,5 @@ Eric Dong <eric.dong@intel.com> <ydong10@Edk2>
 Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@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>
+Hot Tian <hot.tian@intel.com> <hhtian@6f19259b-4bc3-4df7-8a09-765794883524>
-- 
2.21.0

[PATCH v3 13/32] .mailmap: Add an entry for Jiewen Yao

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Jiewen Yao to have his/her name and email
address displayed properly in the git history.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.mailmap b/.mailmap
index 82d202841d94..566bd0e81356 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,3 +27,9 @@ 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>
+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>
+Jiewen Yao <jiewen.yao@intel.com> <jyao1>
+Jiewen Yao <jiewen.yao@intel.com> <jyao1@6f19259b-4bc3-4df7-8a09-765794883524>
+Jiewen Yao <jiewen.yao@intel.com> <jyao1@Edk2>
-- 
2.21.0

[PATCH v3 14/32] .mailmap: Add an entry for Jim Dailey

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Jim Dailey to have his/her name and email
address displayed properly in the git history.

Cc: Jim Dailey <Jim.Dailey@Dell.com>
Reviewed-by: Jim Dailey <Jim.Dailey@Dell.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 566bd0e81356..1b936f892e7a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,3 +33,5 @@ Jiewen Yao <jiewen.yao@intel.com> <Jiewen.Yao@intel.com>
 Jiewen Yao <jiewen.yao@intel.com> <jyao1>
 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>
-- 
2.21.0

[PATCH v3 15/32] .mailmap: Add an entry for Laszlo Ersek

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Laszlo Ersek to have his/her name and email
address displayed properly in the git history.

Cc: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 1b936f892e7a..48e4ca43b5f6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,3 +35,5 @@ 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>
+Laszlo Ersek <lersek@redhat.com> <lersek@6f19259b-4bc3-4df7-8a09-765794883524>
+Laszlo Ersek <lersek@redhat.com> <lersek@Edk2>
-- 
2.21.0

[PATCH v3 16/32] .mailmap: Add an entry for Liming Gao

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Liming Gao to have his/her name and email
address displayed properly in the git history.

Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index 48e4ca43b5f6..e38aa883d743 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,3 +37,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 <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>
+Liming Gao <liming.gao@intel.com> <liming.gao@intel.com>
-- 
2.21.0

[PATCH v3 17/32] .mailmap: Add an entry for Maciej Rabeda

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Maciej Rabeda to have his/her name and email
address displayed properly in the git history.

Cc: Maciej Rabeda <maciej.rabeda@intel.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index e38aa883d743..b66d4ef9437a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,3 +41,4 @@ 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>
 Liming Gao <liming.gao@intel.com> <liming.gao@intel.com>
+Maciej Rabeda <maciej.rabeda@intel.com>
-- 
2.21.0

[PATCH v3 18/32] .mailmap: Add an entry for Marc-André Lureau

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Marc-André Lureau to have his/her name and email
address displayed properly in the git history.

Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index b66d4ef9437a..d28b28f6f683 100644
--- a/.mailmap
+++ b/.mailmap
@@ -42,3 +42,4 @@ 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>
+Marc-André Lureau <marcandre.lureau@redhat.com> <marcandre.lureau@redhat.com>
-- 
2.21.0

[PATCH v3 19/32] .mailmap: Add an entry for Marvin Häuser

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Marvin Häuser to have his/her name and email
address displayed properly in the git history (in particular,
commit 62ec4a5e).

Cc: Marvin Häuser <Marvin.Haeuser@outlook.de>
Cc: Marvin Häuser <Marvin.Haeuser@outlook.com>
Reviewed-by: Marvin Häuser <mhaeuser@outlook.de>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index d28b28f6f683..43edb3c8e927 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,3 +43,6 @@ 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>
+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.21.0

[PATCH v3 20/32] .mailmap: Add an entry for Maurice Ma

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Maurice Ma to have his/her name and email
address displayed properly in the git history.

Cc: Maurice Ma <maurice.ma@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 43edb3c8e927..0d30d5b0314d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -46,3 +46,4 @@ Marc-André Lureau <marcandre.lureau@redhat.com> <marcandre.lureau@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>
+Maurice Ma <maurice.ma@intel.com>
-- 
2.21.0

[PATCH v3 21/32] .mailmap: Add an entry for Michael Kubacki

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Michael Kubacki to have his/her name and email
address displayed properly in the git history.

Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 0d30d5b0314d..c87c23560a54 100644
--- a/.mailmap
+++ b/.mailmap
@@ -47,3 +47,5 @@ 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 Kubacki <michael.a.kubacki@intel.com>
+Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=3c8b0226e75f4ab08d20c151cb7a8a72>
-- 
2.21.0

[PATCH v3 22/32] .mailmap: Add an entry for Ming Tan

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Ming Tan to have his/her name and email address
displayed properly in the git history.

Cc: Ming Tan <ming.tan@intel.com>
Reviewed-by: Ming Tan <ming.tan@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index c87c23560a54..99128ec1b49e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -49,3 +49,4 @@ Marvin Häuser <mhaeuser@outlook.de>
 Maurice Ma <maurice.ma@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.21.0

[PATCH v3 23/32] .mailmap: Add an entry for Nikolai Saoukh

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Nikolai Saoukh to have his/her name and email
address displayed properly in the git history.

Cc: Nikolai Saoukh <nms@otdel-1.org>
Reviewed-by: Nikolai Saoukh <nms@otdel-1.org>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 99128ec1b49e..2960aabaa1cc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -50,3 +50,4 @@ Maurice Ma <maurice.ma@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>
+Nikolai Saoukh <nms@otdel-1.org>
-- 
2.21.0

[PATCH v3 24/32] .mailmap: Add an entry for Philippe Mathieu-Daudé

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Philippe Mathieu-Daudé to have his/her name and
email address displayed properly in the git history.

Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 2960aabaa1cc..9082d9912acf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,3 +51,4 @@ 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>
+Philippe Mathieu-Daudé <philmd@redhat.com>
-- 
2.21.0

[PATCH v3 25/32] .mailmap: Add an entry for Ray Ni

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Ray Ni to have his/her name and email address
displayed properly in the git history.

Cc: Ray Ni <ray.ni@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.mailmap b/.mailmap
index 9082d9912acf..7f68422028c4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -52,3 +52,10 @@ 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>
+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>
+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>
-- 
2.21.0

[PATCH v3 26/32] .mailmap: Add an entry for Samer El-Haj-Mahmoud

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Samer El-Haj-Mahmoud to have his/her name and
email address displayed properly in the git history.

Cc: Samer El-Haj-Mahmoud <elhaj@hpe.com>
Cc: Samer El-Haj-Mahmoud  <samer@elhajmahmoud.com>
Reviewed-by: Samer El-Haj-Mahmoud  <samer@elhajmahmoud.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 7f68422028c4..504a7ea91ba0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,3 +59,5 @@ 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>
+Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <elhaj@hpe.com>
+Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <Samer El-Haj-Mahmoud elhaj@hp.com>
-- 
2.21.0

[PATCH v3 27/32] .mailmap: Add an entry for Shenglei Zhang

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Shenglei Zhang to have his/her name and email
address displayed properly in the git history.

Cc: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Shenglei Zhang <shenglei.zhang@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 504a7ea91ba0..f574194fefbd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -61,3 +61,4 @@ Ray Ni <ray.ni@intel.com> <Ruiyu.ni@Intel.com>
 Ray Ni <ray.ni@intel.com> <ruyu.ni@intel.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.21.0

[PATCH v3 28/32] .mailmap: Add an entry for Star Zeng

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Star Zeng to have his/her name and email address
displayed properly in the git history.

Cc: Star Zeng <star.zeng@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index f574194fefbd..b15d4f3bbddd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -62,3 +62,6 @@ Ray Ni <ray.ni@intel.com> <ruyu.ni@intel.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>
+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>
-- 
2.21.0

[PATCH v3 29/32] .mailmap: Add an entry for Vitaly Cheptsov

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Vitaly Cheptsov to have his/her name and email
address displayed properly in the git history.

Cc: Vitaly Cheptsov <vit9696@protonmail.com>
Reviewed-by: Vitaly Cheptsov <vit9696@protonmail.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index b15d4f3bbddd..8b3140e90318 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,3 +65,4 @@ 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>
+Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
-- 
2.21.0

[PATCH v3 30/32] .mailmap: Add an entry for Vladimir Olovyannikov

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Vladimir Olovyannikov to have his/her name and
email address displayed properly in the git history.

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

diff --git a/.mailmap b/.mailmap
index 8b3140e90318..6e61fec90bee 100644
--- a/.mailmap
+++ b/.mailmap
@@ -66,3 +66,4 @@ 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>
 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.21.0

[PATCH v3 31/32] .mailmap: Add an entry for Yonghong Zhu

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Yonghong Zhu to have his/her name and email
address displayed properly in the git history.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 6e61fec90bee..881734559945 100644
--- a/.mailmap
+++ b/.mailmap
@@ -67,3 +67,5 @@ Star Zeng <star.zeng@intel.com> <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
 Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>
 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>
+Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
-- 
2.21.0

[PATCH v3 32/32] .mailmap: Add an entry for Yu-Chen Lin

[Philippe Mathieu-Daudé]

We use .mailmap to display contributors email addresses in an
uniform format.

Add an entry for Yu-Chen Lin to have his/her name and email
address displayed properly in the git history.

Cc: Yu-Chen Lin <yuchenlin@synology.com>
Reviewed-by: Yu-Chen Lin <yuchenlin@synology.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 881734559945..ae179b0886c7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -69,3 +69,4 @@ Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
 Yonghong Zhu <yonghong.zhu@intel.com>
 Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>
+Yu-Chen Lin <yuchenlin@synology.com>
-- 
2.21.0

Re: [edk2-devel] [PATCH v3 16/32] .mailmap: Add an entry for Liming Gao

[Liming Gao]

Reviewed-by: Liming Gao <liming.gao@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Philippe Mathieu-Daudé
Sent: 2020年1月3日 3:23
To: devel@edk2.groups.io
Cc: Leif Lindholm <leif.lindholm@linaro.org>; Kinney, Michael D <michael.d.kinney@intel.com>; Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Philippe Mathieu-Daude <philmd@redhat.com>; Gao, Liming <liming.gao@intel.com>
Subject: [edk2-devel] [PATCH v3 16/32] .mailmap: Add an entry for Liming Gao

We use .mailmap to display contributors email addresses in an uniform format.

Add an entry for Liming Gao to have his/her name and email address displayed properly in the git history.

Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index 48e4ca43b5f6..e38aa883d743 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,3 +37,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 <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> Liming Gao 
+<liming.gao@intel.com> <liming.gao@intel.com>
--
2.21.0

Re: [PATCH v3 13/32] .mailmap: Add an entry for Jiewen Yao

[Yao, Jiewen]

Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

> -----Original Message-----
> From: Philippe Mathieu-Daude <philmd@redhat.com>
> Sent: Friday, January 3, 2020 3:23 AM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Andrew Fish <afish@apple.com>; Laszlo Ersek
> <lersek@redhat.com>; Philippe Mathieu-Daude <philmd@redhat.com>; Yao,
> Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH v3 13/32] .mailmap: Add an entry for Jiewen Yao
> 
> We use .mailmap to display contributors email addresses in an
> uniform format.
> 
> Add an entry for Jiewen Yao to have his/her name and email
> address displayed properly in the git history.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
> ---
>  .mailmap | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 82d202841d94..566bd0e81356 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -27,3 +27,9 @@ 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>
> +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>
> +Jiewen Yao <jiewen.yao@intel.com> <jyao1>
> +Jiewen Yao <jiewen.yao@intel.com> <jyao1@6f19259b-4bc3-4df7-8a09-
> 765794883524>
> +Jiewen Yao <jiewen.yao@intel.com> <jyao1@Edk2>
> --
> 2.21.0

Re: [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history

[Laszlo Ersek]

On 01/02/20 20:23, Philippe Mathieu-Daude wrote:
> The .mailmap git feature helps fixing commit mistakes (in name/email).
> 
> The easiest way to use it is with the --use-mailmap flag:
> 
>   $ git log --use-mailmap
> 
> See documentation [1] and [2], and interesting blog [3].
> 
> Laszlo replied [4] to v1 explaining stewards want to avoid avoid
> cross-domain mapping, and suggested to split in per email-address
> patches, so contributors can individually Ack/Nack.
> 
> This v3 collects the patches of the 30 developers who replied to
> the v2 [5] with their R-b tag.

OK. So am I correct to think that this sub-series is ready for merging?

>  There is an exception with patch

Hmmm... unfinished thought. :) Apparently, there is a patch that
prevents the series from being merged? Which one?

> I dropped the unreviewed patches and am cc'ing this series to the
> Tianocore stewards, as suggested by Laszlo in [6]. Each developer
> will still be Cc'ed in case a modification was requested, he/her
> can verify.

Ah, OK, so this is *not* the final version (for round 1, per [6]), just yet.

Can you please monitor the remaining feedback for this series? If
everyone is happy with the v3 updates, and you determine that the patch
set is fully reviewed, I can help pick up the new tags, and merge the
series.

Thanks!
Laszlo

> 
> This series is available at:
> https://gitlab.com/philmd/edk2/commits/mailmap-v3
> 
> Regards,
> 
> Phil.
> 
> [1] https://git-scm.com/docs/git-shortlog#_mapping_authors
> [2] https://git-scm.com/docs/git-check-mailmap#_mapping_authors
> [3] https://github.com/sympy/sympy/wiki/Using-.mailmap#making-mailmap-entries
> [4] https://edk2.groups.io/g/devel/message/51657
> [5] https://edk2.groups.io/g/devel/message/51834
> [6] https://edk2.groups.io/g/devel/message/51906
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Philippe Mathieu-Daudé (32):
>   .mailmap: Add a stub with documentation
>   .mailmap: Add an entry for Aaron Li
>   .mailmap: Add an entry for Antoine Cœur
>   .mailmap: Add an entry for Ard Biesheuvel
>   .mailmap: Add an entry for Ashley DeSimone
>   .mailmap: Add an entry for Baraneedharan Anbazhagan
>   .mailmap: Add an entry for Chasel Chiu
>   .mailmap: Add an entry for Christopher J Zurcher
>   .mailmap: Add an entry for Eric Dong
>   .mailmap: Add an entry for Erik Bjorge
>   .mailmap: Add an entry for Hao Wu
>   .mailmap: Add an entry for Hot Tian
>   .mailmap: Add an entry for Jiewen Yao
>   .mailmap: Add an entry for Jim Dailey
>   .mailmap: Add an entry for Laszlo Ersek
>   .mailmap: Add an entry for Liming Gao
>   .mailmap: Add an entry for Maciej Rabeda
>   .mailmap: Add an entry for Marc-André Lureau
>   .mailmap: Add an entry for Marvin Häuser
>   .mailmap: Add an entry for Maurice Ma
>   .mailmap: Add an entry for Michael Kubacki
>   .mailmap: Add an entry for Ming Tan
>   .mailmap: Add an entry for Nikolai Saoukh
>   .mailmap: Add an entry for Philippe Mathieu-Daudé
>   .mailmap: Add an entry for Ray Ni
>   .mailmap: Add an entry for Samer El-Haj-Mahmoud
>   .mailmap: Add an entry for Shenglei Zhang
>   .mailmap: Add an entry for Star Zeng
>   .mailmap: Add an entry for Vitaly Cheptsov
>   .mailmap: Add an entry for Vladimir Olovyannikov
>   .mailmap: Add an entry for Yonghong Zhu
>   .mailmap: Add an entry for Yu-Chen Lin
> 
>  .mailmap | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 72 insertions(+)
>  create mode 100644 .mailmap
> 

Re: [PATCH v3 24/32] .mailmap: Add an entry for Philippe Mathieu-Daudé

[Laszlo Ersek]

On 01/02/20 20:23, Philippe Mathieu-Daude wrote:
> We use .mailmap to display contributors email addresses in an
> uniform format.
> 
> Add an entry for Philippe Mathieu-Daudé to have his/her name and
> email address displayed properly in the git history.
> 
> Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 2960aabaa1cc..9082d9912acf 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -51,3 +51,4 @@ 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>
> +Philippe Mathieu-Daudé <philmd@redhat.com>
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Re: [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history

[Philippe Mathieu-Daudé]

Hi Laszlo,

On 1/3/20 2:48 PM, Laszlo Ersek wrote:
> On 01/02/20 20:23, Philippe Mathieu-Daude wrote:
>> The .mailmap git feature helps fixing commit mistakes (in name/email).
>>
>> The easiest way to use it is with the --use-mailmap flag:
>>
>>    $ git log --use-mailmap
>>
>> See documentation [1] and [2], and interesting blog [3].
>>
>> Laszlo replied [4] to v1 explaining stewards want to avoid avoid
>> cross-domain mapping, and suggested to split in per email-address
>> patches, so contributors can individually Ack/Nack.
>>
>> This v3 collects the patches of the 30 developers who replied to
>> the v2 [5] with their R-b tag.
> 
> OK. So am I correct to think that this sub-series is ready for merging?
> 
>>   There is an exception with patch
> 
> Hmmm... unfinished thought. :) Apparently, there is a patch that
> prevents the series from being merged? Which one?

This comment was about patch 13/32, but Jiewen Yao already reviewed it, 
so this series is fully reviewed by each developer.

>> I dropped the unreviewed patches and am cc'ing this series to the
>> Tianocore stewards, as suggested by Laszlo in [6]. Each developer
>> will still be Cc'ed in case a modification was requested, he/her
>> can verify.
> 
> Ah, OK, so this is *not* the final version (for round 1, per [6]), just yet.
> 
> Can you please monitor the remaining feedback for this series? If
> everyone is happy with the v3 updates, and you determine that the patch
> set is fully reviewed, I can help pick up the new tags, and merge the
> series.

Since the change is a one-line, I'd prefer avoid respining the whole series.

IMHO the series is ready for step #4 "stewards go through the backlog, 
and decide one by one whether, for person X, the proposed mappings are 
cross-domain or not, and ACK or NACK" which I don't really get.
I suppose this will be resolved in the open on the mailing list, so 
individuals will get notified their patch got refused.

Thank for offering to pick and merge this series!

Phil.

>>
>> This series is available at:
>> https://gitlab.com/philmd/edk2/commits/mailmap-v3
>>
>> Regards,
>>
>> Phil.
>>
>> [1] https://git-scm.com/docs/git-shortlog#_mapping_authors
>> [2] https://git-scm.com/docs/git-check-mailmap#_mapping_authors
>> [3] https://github.com/sympy/sympy/wiki/Using-.mailmap#making-mailmap-entries
>> [4] https://edk2.groups.io/g/devel/message/51657
>> [5] https://edk2.groups.io/g/devel/message/51834
>> [6] https://edk2.groups.io/g/devel/message/51906
[...]

Re: [PATCH v3 07/32] .mailmap: Add an entry for Chasel Chiu

[Chiu, Chasel]

Thanks, already reviewed-by.

> -----Original Message-----
> From: Philippe Mathieu-Daude <philmd@redhat.com>
> Sent: Friday, January 3, 2020 3:23 AM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Andrew Fish <afish@apple.com>; Laszlo
> Ersek <lersek@redhat.com>; Philippe Mathieu-Daude <philmd@redhat.com>;
> Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH v3 07/32] .mailmap: Add an entry for Chasel Chiu
> 
> We use .mailmap to display contributors email addresses in an uniform
> format.
> 
> Add an entry for Chasel Chiu to have his/her name and email address
> displayed properly in the git history.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 35fbb78c6b43..8f351b59ea76 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -16,3 +16,4 @@ Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>  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>
> --
> 2.21.0

Re: [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history

[Laszlo Ersek]

On 01/03/20 14:56, Philippe Mathieu-Daudé wrote:
> On 1/3/20 2:48 PM, Laszlo Ersek wrote:

>> Apparently, there is a patch that
>> prevents the series from being merged? Which one?
>
> This comment was about patch 13/32, but Jiewen Yao already reviewed
> it,

OK, thanks.

> so this series is fully reviewed by each developer.

I've now tried applying this series locally (for a github.com pull
request). But git-am fails, on patch#6 ("corrupted patch").

I've checked the patch email (as saved from Thunderbird) and I can see
it uses quoted-printable transfer encoding. That has basically never
worked with edk2. Can you please send a v4, with 8-bit encoding?

Please see:

  [edk2-devel] [PATCH]
  BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py

  https://edk2.groups.io/g/devel/message/52323
  http://mid.mail-archive.com/02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com

>> Can you please monitor the remaining feedback for this series? If
>> everyone is happy with the v3 updates, and you determine that the
>> patch set is fully reviewed, I can help pick up the new tags, and
>> merge the series.
>
> Since the change is a one-line, I'd prefer avoid respining the whole
> series.

I think you mean the change is a one-liner *for a commit message*
(namely, Jiewen's R-b).

I would normally agree (I'd just pick up that R-b from the list), but
again, I can't apply the v3 patches in the first place.

> IMHO the series is ready for step #4 "stewards go through the backlog,
> and decide one by one whether, for person X, the proposed mappings are
> cross-domain or not, and ACK or NACK" which I don't really get.
> I suppose this will be resolved in the open on the mailing list, so
> individuals will get notified their patch got refused.

Let me quote the original suggestion in-line, from here:

  https://edk2.groups.io/g/devel/message/51906
  http://mid.mail-archive.com/9e212952-a114-57d0-9880-6686edc4d8ae@redhat.com

On 12/06/19 13:23, Laszlo Ersek wrote:
> - Collect feedback (from individual reviewers / contributors) for one
> or two weeks
>
> - Accept cross-domain mappings in any patch where the person subject
> to the patch is ACKing the patch from the mapped-to (i.e. "current")
> email address. This is now a *lot* easier to do, because the patch
> series is structured by person.
>
> - After one or two weeks, push all the patches that have been approved
> like explained above.

This is where we are now. We're about to push the patches with the
direct contributor approvals.

This covers 32 patches (v3) out of your original 105 (v2).

> - Repost the rest of the series, CC'd solely to the stewards. We will
> then have to go through the backlog, and decide one by one whether,
> for person X, the proposed mappings are cross-domain or not, and ACK
> or NACK accordingly.

This is "step 4", and for that, you should please post the *rest* of the
patches: approximately 105-32 = 73 patches.

That is the "backlog". The idea is that the stewards should review
those, because we should be permitted to add email mappings even for
such contributors that do not personally comment on the proposed
mappings, as long as those mappings are not cross-domain.

>
> - Push the second round, drop the rest for good.

And here the "rest" (to be dropped for good) stands for such patches
that even the stewards don't approve (because the mappings appear
cross-domain, which cannot be approved without direct contributor
feedback).

Thanks!
Laszlo

Re: [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history

[Philippe Mathieu-Daudé]

On 1/6/20 11:41 AM, Laszlo Ersek wrote:
> On 01/03/20 14:56, Philippe Mathieu-Daudé wrote:
>> On 1/3/20 2:48 PM, Laszlo Ersek wrote:
> 
>>> Apparently, there is a patch that
>>> prevents the series from being merged? Which one?
>>
>> This comment was about patch 13/32, but Jiewen Yao already reviewed
>> it,
> 
> OK, thanks.
> 
>> so this series is fully reviewed by each developer.
> 
> I've now tried applying this series locally (for a github.com pull
> request). But git-am fails, on patch#6 ("corrupted patch").
> 
> I've checked the patch email (as saved from Thunderbird) and I can see
> it uses quoted-printable transfer encoding. That has basically never
> worked with edk2. Can you please send a v4, with 8-bit encoding?
> 
> Please see:
> 
>    [edk2-devel] [PATCH]
>    BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py
> 
>    https://edk2.groups.io/g/devel/message/52323
>    http://mid.mail-archive.com/02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com

Ah yes, I enabled this setting globally, but not in my edk2 identity 
(which is the one I use to avoid utf8 in my last name, which is the 
single community with UTF-8 issues I've to deal with).

    --identity=<identity>

      A configuration identity. When given, causes values
      in the sendemail.<identity> subsection to take
      precedence over values in the sendemail section. The
      default identity is the value of sendemail.identity.

I now fixed my config with:

$ git config --global sendemail.edk2.transferEncoding 8-bit

(btw I'm unable to apply the previously referred patch).

>>> Can you please monitor the remaining feedback for this series? If
>>> everyone is happy with the v3 updates, and you determine that the
>>> patch set is fully reviewed, I can help pick up the new tags, and
>>> merge the series.
>>
>> Since the change is a one-line, I'd prefer avoid respining the whole
>> series.
> 
> I think you mean the change is a one-liner *for a commit message*
> (namely, Jiewen's R-b).
> 
> I would normally agree (I'd just pick up that R-b from the list), but
> again, I can't apply the v3 patches in the first place.

Fair enough.

>> IMHO the series is ready for step #4 "stewards go through the backlog,
>> and decide one by one whether, for person X, the proposed mappings are
>> cross-domain or not, and ACK or NACK" which I don't really get.
>> I suppose this will be resolved in the open on the mailing list, so
>> individuals will get notified their patch got refused.
> 
> Let me quote the original suggestion in-line, from here:
> 
>    https://edk2.groups.io/g/devel/message/51906
>    http://mid.mail-archive.com/9e212952-a114-57d0-9880-6686edc4d8ae@redhat.com
> 
> On 12/06/19 13:23, Laszlo Ersek wrote:
>> - Collect feedback (from individual reviewers / contributors) for one
>> or two weeks
>>
>> - Accept cross-domain mappings in any patch where the person subject
>> to the patch is ACKing the patch from the mapped-to (i.e. "current")
>> email address. This is now a *lot* easier to do, because the patch
>> series is structured by person.
>>
>> - After one or two weeks, push all the patches that have been approved
>> like explained above.
> 
> This is where we are now. We're about to push the patches with the
> direct contributor approvals.
> 
> This covers 32 patches (v3) out of your original 105 (v2).
> 
>> - Repost the rest of the series, CC'd solely to the stewards. We will
>> then have to go through the backlog, and decide one by one whether,
>> for person X, the proposed mappings are cross-domain or not, and ACK
>> or NACK accordingly.
> 
> This is "step 4", and for that, you should please post the *rest* of the
> patches: approximately 105-32 = 73 patches.
> 
> That is the "backlog". The idea is that the stewards should review
> those, because we should be permitted to add email mappings even for
> such contributors that do not personally comment on the proposed
> mappings, as long as those mappings are not cross-domain.

OK, understood now :)

Another way can be to not fix broken/obsolete emails, but fix author names.

>>
>> - Push the second round, drop the rest for good.
> 
> And here the "rest" (to be dropped for good) stands for such patches
> that even the stewards don't approve (because the mappings appear
> cross-domain, which cannot be approved without direct contributor
> feedback).
> 
> Thanks!
> Laszlo
> 

Re: [PATCH v3 17/32] .mailmap: Add an entry for Maciej Rabeda

[Rabeda, Maciej]

Reviewed-by: Maciej Rabeda <maciej.rabeda@intel.com>

Thanks!
Maciej

-----Original Message-----
From: Philippe Mathieu-Daude <philmd@redhat.com> 
Sent: Thursday, January 2, 2020 20:24
To: devel@edk2.groups.io
Cc: Leif Lindholm <leif.lindholm@linaro.org>; Kinney, Michael D <michael.d.kinney@intel.com>; Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Philippe Mathieu-Daude <philmd@redhat.com>; Rabeda, Maciej <maciej.rabeda@intel.com>
Subject: [PATCH v3 17/32] .mailmap: Add an entry for Maciej Rabeda

We use .mailmap to display contributors email addresses in an uniform format.

Add an entry for Maciej Rabeda to have his/her name and email address displayed properly in the git history.

Cc: Maciej Rabeda <maciej.rabeda@intel.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@intel.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index e38aa883d743..b66d4ef9437a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,3 +41,4 @@ 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>  Liming Gao <liming.gao@intel.com> <liming.gao@intel.com>
+Maciej Rabeda <maciej.rabeda@intel.com>
--
2.21.0

--------------------------------------------------------------------

Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN.

Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek
przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by
others is strictly prohibited.