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

[PATCH v4 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 v4 collects the patches of the 30 developers who replied to
the v2 [5] and v3 [6] with their R-b tag.

I dropped the unreviewed patches and am cc'ing this series to the
Tianocore stewards, as suggested by Laszlo in [7].

This series is sent with 8-bit encoding, but is also available at:
https://gitlab.com/philmd/edk2/commits/mailmap-v4

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/52667
[7] https://edk2.groups.io/g/devel/message/51906

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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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>
Reviewed-by: 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.

Reviewed-by: Laszlo Ersek <lersek@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 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

[PATCH v4 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.1

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

[Laszlo Ersek]

On 01/06/20 12:53, 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 v4 collects the patches of the 30 developers who replied to
> the v2 [5] and v3 [6] with their R-b tag.
> 
> I dropped the unreviewed patches and am cc'ing this series to the
> Tianocore stewards, as suggested by Laszlo in [7].
> 
> This series is sent with 8-bit encoding, but is also available at:
> https://gitlab.com/philmd/edk2/commits/mailmap-v4
> 
> 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/52667
> [7] https://edk2.groups.io/g/devel/message/51906

Pushed as commit range 6cfb6da9518d..0ef6fbbd114e, via <https://github.com/tianocore/edk2/pull/272>.

I had to implement 5 modifications in the commit messages, in total:

- In one case, "PatchCheck.py" correctly warned about a malformed Reviewed-by tag. I had to insert a space character between the name and the email address.

- In four cases, "PatchCheck.py" incorrectly broke on subject lines that were not plain ASCII, but contained unicode code points encoded as valid UTF-8. I had to transliterate those subject lines manually, to suppress the "PatchCheck.py" errors.

Please see the git-range-diff output below that summarizes the changes relative to your "mailmap-v4" branch.

---*---
 1:  eaeae84de557 !  1:  4a1aeca3bd02 .mailmap: Add a stub with documentation
    @@ -14,6 +14,7 @@
     
         Reviewed-by: Laszlo Ersek <lersek@redhat.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-2-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     new file mode 100644
 2:  d51c7b4139f7 !  2:  ba5410320bab .mailmap: Add an entry for Aaron Li
    @@ -12,6 +12,7 @@
         Cc: Songpeng Li <songpeng.li@intel.com>
         Reviewed-by: Aaron Li <aaron.li@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-3-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
 3:  b9e6c89e78fa !  3:  0ce7f25fe3aa .mailmap: Add an entry for Antoine Cœur
    @@ -1,6 +1,6 @@
     Author: Philippe Mathieu-Daude <philmd@redhat.com>
     
    -    .mailmap: Add an entry for Antoine Cœur
    +    .mailmap: Add an entry for Antoine Coeur
     
         We use .mailmap to display contributors email addresses in an
         uniform format.
    @@ -9,8 +9,11 @@
         address displayed properly in the git history.
     
         Cc: Antoine Cœur <coeur@gmx.fr>
    -    Reviewed-by: Antoine Cœur<coeur@gmx.fr>
    +    Reviewed-by: Antoine Cœur <coeur@gmx.fr>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-4-philmd@redhat.com>
    +    [lersek@redhat.com: fix up valid PatchCheck.py error in Reviewed-by]
    +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
 4:  0b1e7ea11688 !  4:  83e78feb8092 .mailmap: Add an entry for Ard Biesheuvel
    @@ -11,6 +11,7 @@
         Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
         Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-5-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
 5:  7462b7cbc23c !  5:  caa6584f36bc .mailmap: Add an entry for Ashley DeSimone
    @@ -11,6 +11,7 @@
         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>
    +    Message-Id: <20200106115415.11624-6-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
 6:  069957aaaacc !  6:  d42046e1da94 .mailmap: Add an entry for Baraneedharan Anbazhagan
    @@ -11,6 +11,7 @@
         Cc: Baraneedharan Anbazhagan <anbazhagan@hp.com>
         Reviewed-by: Baraneedharan Anbazhagan <anbazhagan@hp.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-7-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
 7:  4244e9dc3dbd !  7:  31d60b9ba442 .mailmap: Add an entry for Chasel Chiu
    @@ -11,6 +11,7 @@
         Cc: Chasel Chiu <chasel.chiu@intel.com>
         Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-8-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
 8:  90ca9851f61a !  8:  0d141df465c9 .mailmap: Add an entry for Christopher J Zurcher
    @@ -11,6 +11,7 @@
         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>
    +    Message-Id: <20200106115415.11624-9-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
 9:  43bffebe22d1 !  9:  52b6a7c88940 .mailmap: Add an entry for Eric Dong
    @@ -11,6 +11,7 @@
         Cc: Eric Dong <eric.dong@intel.com>
         Reviewed-by: Eric Dong <eric.dong@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-10-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
10:  20f9db0fc4b7 ! 10:  e2a8eaec0fbc .mailmap: Add an entry for Erik Bjorge
    @@ -11,6 +11,7 @@
         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>
    +    Message-Id: <20200106115415.11624-11-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
11:  78b0c1c13669 ! 11:  082208a8495e .mailmap: Add an entry for Hao Wu
    @@ -11,6 +11,7 @@
         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>
    +    Message-Id: <20200106115415.11624-12-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
12:  0056fcafdeca ! 12:  59bbab3a9a34 .mailmap: Add an entry for Hot Tian
    @@ -11,6 +11,7 @@
         Cc: Hot Tian <hot.tian@intel.com>
         Reviewed-by: Hot Tian <hot.tian@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-13-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
13:  20d75fb6974e ! 13:  1bbbd6a79d29 .mailmap: Add an entry for Jiewen Yao
    @@ -11,6 +11,7 @@
         Cc: Jiewen Yao <jiewen.yao@intel.com>
         Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-14-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
14:  361d0b00d16e ! 14:  5556529b9493 .mailmap: Add an entry for Jim Dailey
    @@ -11,6 +11,7 @@
         Cc: Jim Dailey <Jim.Dailey@Dell.com>
         Reviewed-by: Jim Dailey <Jim.Dailey@Dell.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-15-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
15:  efe98a6386f6 ! 15:  f235838f58b9 .mailmap: Add an entry for Laszlo Ersek
    @@ -11,6 +11,7 @@
         Cc: Laszlo Ersek <lersek@redhat.com>
         Reviewed-by: Laszlo Ersek <lersek@redhat.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-16-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
16:  f8c989462c4a ! 16:  44c9a93948de .mailmap: Add an entry for Liming Gao
    @@ -11,6 +11,7 @@
         Cc: Liming Gao <liming.gao@intel.com>
         Reviewed-by: Liming Gao <liming.gao@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-17-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
17:  454d9fe1b13b ! 17:  a85cdb9f2b4d .mailmap: Add an entry for Maciej Rabeda
    @@ -11,6 +11,7 @@
         Cc: Maciej Rabeda <maciej.rabeda@intel.com>
         Reviewed-by: Maciej Rabeda <maciej.rabeda@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-18-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
18:  99899c71a7f4 ! 18:  9b2e99e50a72 .mailmap: Add an entry for Marc-André Lureau
    @@ -1,6 +1,6 @@
     Author: Philippe Mathieu-Daude <philmd@redhat.com>
     
    -    .mailmap: Add an entry for Marc-André Lureau
    +    .mailmap: Add an entry for Marc-Andre Lureau
     
         We use .mailmap to display contributors email addresses in an
         uniform format.
    @@ -11,6 +11,8 @@
         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>
    +    Message-Id: <20200106115415.11624-19-philmd@redhat.com>
    +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
19:  ef0db1c9c6c4 ! 19:  76fc03874674 .mailmap: Add an entry for Marvin Häuser
    @@ -1,6 +1,6 @@
     Author: Philippe Mathieu-Daude <philmd@redhat.com>
     
    -    .mailmap: Add an entry for Marvin Häuser
    +    .mailmap: Add an entry for Marvin Haeuser
     
         We use .mailmap to display contributors email addresses in an
         uniform format.
    @@ -13,6 +13,8 @@
         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>
    +    Message-Id: <20200106115415.11624-20-philmd@redhat.com>
    +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
20:  073e907d6369 ! 20:  8ef8175a330c .mailmap: Add an entry for Maurice Ma
    @@ -11,6 +11,7 @@
         Cc: Maurice Ma <maurice.ma@intel.com>
         Reviewed-by: Maurice Ma <maurice.ma@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-21-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
21:  30d69fe146cc ! 21:  43f2c9f8eb94 .mailmap: Add an entry for Michael Kubacki
    @@ -11,6 +11,7 @@
         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>
    +    Message-Id: <20200106115415.11624-22-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
22:  2598f7175eb4 ! 22:  266efa6b296c .mailmap: Add an entry for Ming Tan
    @@ -11,6 +11,7 @@
         Cc: Ming Tan <ming.tan@intel.com>
         Reviewed-by: Ming Tan <ming.tan@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-23-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
23:  535592f359d5 ! 23:  21429c1566fb .mailmap: Add an entry for Nikolai Saoukh
    @@ -11,6 +11,7 @@
         Cc: Nikolai Saoukh <nms@otdel-1.org>
         Reviewed-by: Nikolai Saoukh <nms@otdel-1.org>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-24-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
24:  e3d5d0309650 ! 24:  a292d6c8ef31 .mailmap: Add an entry for Philippe Mathieu-Daudé
    @@ -1,6 +1,6 @@
     Author: Philippe Mathieu-Daude <philmd@redhat.com>
     
    -    .mailmap: Add an entry for Philippe Mathieu-Daudé
    +    .mailmap: Add an entry for Philippe Mathieu-Daude
     
         We use .mailmap to display contributors email addresses in an
         uniform format.
    @@ -10,6 +10,8 @@
     
         Reviewed-by: Laszlo Ersek <lersek@redhat.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-25-philmd@redhat.com>
    +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
25:  2ca124768e5a ! 25:  80f7c1b46408 .mailmap: Add an entry for Ray Ni
    @@ -11,6 +11,7 @@
         Cc: Ray Ni <ray.ni@intel.com>
         Reviewed-by: Ray Ni <ray.ni@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-26-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
26:  c1cb9e02b79d ! 26:  ad12178c3dc1 .mailmap: Add an entry for Samer El-Haj-Mahmoud
    @@ -12,6 +12,7 @@
         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>
    +    Message-Id: <20200106115415.11624-27-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
27:  c24088eb64f6 ! 27:  088573c97381 .mailmap: Add an entry for Shenglei Zhang
    @@ -11,6 +11,7 @@
         Cc: Shenglei Zhang <shenglei.zhang@intel.com>
         Reviewed-by: Shenglei Zhang <shenglei.zhang@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-28-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
28:  ef26ef691e4e ! 28:  0e660ee7a179 .mailmap: Add an entry for Star Zeng
    @@ -11,6 +11,7 @@
         Cc: Star Zeng <star.zeng@intel.com>
         Reviewed-by: Star Zeng <star.zeng@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-29-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
29:  cee7d719359a ! 29:  76b51586f4dc .mailmap: Add an entry for Vitaly Cheptsov
    @@ -11,6 +11,7 @@
         Cc: Vitaly Cheptsov <vit9696@protonmail.com>
         Reviewed-by: Vitaly Cheptsov <vit9696@protonmail.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-30-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
30:  540df330a618 ! 30:  c751368c371a .mailmap: Add an entry for Vladimir Olovyannikov
    @@ -11,6 +11,7 @@
         Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
         Reviewed-by: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-31-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
31:  083b6b1db881 ! 31:  d96c7befc08d .mailmap: Add an entry for Yonghong Zhu
    @@ -11,6 +11,7 @@
         Cc: Yonghong Zhu <yonghong.zhu@intel.com>
         Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-32-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
32:  3b12182e47a5 ! 32:  0ef6fbbd114e .mailmap: Add an entry for Yu-Chen Lin
    @@ -11,6 +11,7 @@
         Cc: Yu-Chen Lin <yuchenlin@synology.com>
         Reviewed-by: Yu-Chen Lin <yuchenlin@synology.com>
         Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
    +    Message-Id: <20200106115415.11624-33-philmd@redhat.com>
     
     diff --git a/.mailmap b/.mailmap
     --- a/.mailmap
---*---

Thanks!
Laszlo

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

[Philippe Mathieu-Daudé]

Hi Laszlo,

On 1/6/20 7:13 PM, Laszlo Ersek wrote:
> On 01/06/20 12:53, 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 v4 collects the patches of the 30 developers who replied to
>> the v2 [5] and v3 [6] with their R-b tag.
>>
>> I dropped the unreviewed patches and am cc'ing this series to the
>> Tianocore stewards, as suggested by Laszlo in [7].
>>
>> This series is sent with 8-bit encoding, but is also available at:
>> https://gitlab.com/philmd/edk2/commits/mailmap-v4
>>
>> 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/52667
>> [7] https://edk2.groups.io/g/devel/message/51906
> 
> Pushed as commit range 6cfb6da9518d..0ef6fbbd114e, via <https://github.com/tianocore/edk2/pull/272>.
> 
> I had to implement 5 modifications in the commit messages, in total:

I'm sorry I gave you extra work :(

> - In one case, "PatchCheck.py" correctly warned about a malformed Reviewed-by tag. I had to insert a space character between the name and the email address.

I did run PatchCheck.py at some point on previous version of this 
series, but I rebased/cherry-picked so many times, I might have used the 
branch previous to PatchCheck.py fixes...

> 
> - In four cases, "PatchCheck.py" incorrectly broke on subject lines that were not plain ASCII, but contained unicode code points encoded as valid UTF-8. I had to transliterate those subject lines manually, to suppress the "PatchCheck.py" errors.
> 
> Please see the git-range-diff output below that summarizes the changes relative to your "mailmap-v4" branch.

Perfect!

> 
> ---*---
>   1:  eaeae84de557 !  1:  4a1aeca3bd02 .mailmap: Add a stub with documentation
>      @@ -14,6 +14,7 @@
>       
>           Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-2-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       new file mode 100644
>   2:  d51c7b4139f7 !  2:  ba5410320bab .mailmap: Add an entry for Aaron Li
>      @@ -12,6 +12,7 @@
>           Cc: Songpeng Li <songpeng.li@intel.com>
>           Reviewed-by: Aaron Li <aaron.li@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-3-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   3:  b9e6c89e78fa !  3:  0ce7f25fe3aa .mailmap: Add an entry for Antoine Cœur
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Antoine Cœur
>      +    .mailmap: Add an entry for Antoine Coeur
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -9,8 +9,11 @@
>           address displayed properly in the git history.
>       
>           Cc: Antoine Cœur <coeur@gmx.fr>
>      -    Reviewed-by: Antoine Cœur<coeur@gmx.fr>
>      +    Reviewed-by: Antoine Cœur <coeur@gmx.fr>

I'm surprised 'œ' is accepted.

>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-4-philmd@redhat.com>
>      +    [lersek@redhat.com: fix up valid PatchCheck.py error in Reviewed-by]
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   4:  0b1e7ea11688 !  4:  83e78feb8092 .mailmap: Add an entry for Ard Biesheuvel
>      @@ -11,6 +11,7 @@
>           Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>           Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-5-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   5:  7462b7cbc23c !  5:  caa6584f36bc .mailmap: Add an entry for Ashley DeSimone
>      @@ -11,6 +11,7 @@
>           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>
>      +    Message-Id: <20200106115415.11624-6-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   6:  069957aaaacc !  6:  d42046e1da94 .mailmap: Add an entry for Baraneedharan Anbazhagan
>      @@ -11,6 +11,7 @@
>           Cc: Baraneedharan Anbazhagan <anbazhagan@hp.com>
>           Reviewed-by: Baraneedharan Anbazhagan <anbazhagan@hp.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-7-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   7:  4244e9dc3dbd !  7:  31d60b9ba442 .mailmap: Add an entry for Chasel Chiu
>      @@ -11,6 +11,7 @@
>           Cc: Chasel Chiu <chasel.chiu@intel.com>
>           Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-8-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   8:  90ca9851f61a !  8:  0d141df465c9 .mailmap: Add an entry for Christopher J Zurcher
>      @@ -11,6 +11,7 @@
>           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>
>      +    Message-Id: <20200106115415.11624-9-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
>   9:  43bffebe22d1 !  9:  52b6a7c88940 .mailmap: Add an entry for Eric Dong
>      @@ -11,6 +11,7 @@
>           Cc: Eric Dong <eric.dong@intel.com>
>           Reviewed-by: Eric Dong <eric.dong@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-10-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 10:  20f9db0fc4b7 ! 10:  e2a8eaec0fbc .mailmap: Add an entry for Erik Bjorge
>      @@ -11,6 +11,7 @@
>           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>
>      +    Message-Id: <20200106115415.11624-11-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 11:  78b0c1c13669 ! 11:  082208a8495e .mailmap: Add an entry for Hao Wu
>      @@ -11,6 +11,7 @@
>           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>
>      +    Message-Id: <20200106115415.11624-12-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 12:  0056fcafdeca ! 12:  59bbab3a9a34 .mailmap: Add an entry for Hot Tian
>      @@ -11,6 +11,7 @@
>           Cc: Hot Tian <hot.tian@intel.com>
>           Reviewed-by: Hot Tian <hot.tian@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-13-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 13:  20d75fb6974e ! 13:  1bbbd6a79d29 .mailmap: Add an entry for Jiewen Yao
>      @@ -11,6 +11,7 @@
>           Cc: Jiewen Yao <jiewen.yao@intel.com>
>           Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-14-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 14:  361d0b00d16e ! 14:  5556529b9493 .mailmap: Add an entry for Jim Dailey
>      @@ -11,6 +11,7 @@
>           Cc: Jim Dailey <Jim.Dailey@Dell.com>
>           Reviewed-by: Jim Dailey <Jim.Dailey@Dell.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-15-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 15:  efe98a6386f6 ! 15:  f235838f58b9 .mailmap: Add an entry for Laszlo Ersek
>      @@ -11,6 +11,7 @@
>           Cc: Laszlo Ersek <lersek@redhat.com>
>           Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-16-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 16:  f8c989462c4a ! 16:  44c9a93948de .mailmap: Add an entry for Liming Gao
>      @@ -11,6 +11,7 @@
>           Cc: Liming Gao <liming.gao@intel.com>
>           Reviewed-by: Liming Gao <liming.gao@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-17-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 17:  454d9fe1b13b ! 17:  a85cdb9f2b4d .mailmap: Add an entry for Maciej Rabeda
>      @@ -11,6 +11,7 @@
>           Cc: Maciej Rabeda <maciej.rabeda@intel.com>
>           Reviewed-by: Maciej Rabeda <maciej.rabeda@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-18-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 18:  99899c71a7f4 ! 18:  9b2e99e50a72 .mailmap: Add an entry for Marc-André Lureau
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Marc-André Lureau
>      +    .mailmap: Add an entry for Marc-Andre Lureau
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -11,6 +11,8 @@
>           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>
>      +    Message-Id: <20200106115415.11624-19-philmd@redhat.com>
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 19:  ef0db1c9c6c4 ! 19:  76fc03874674 .mailmap: Add an entry for Marvin Häuser
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Marvin Häuser
>      +    .mailmap: Add an entry for Marvin Haeuser
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -13,6 +13,8 @@
>           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>
>      +    Message-Id: <20200106115415.11624-20-philmd@redhat.com>
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 20:  073e907d6369 ! 20:  8ef8175a330c .mailmap: Add an entry for Maurice Ma
>      @@ -11,6 +11,7 @@
>           Cc: Maurice Ma <maurice.ma@intel.com>
>           Reviewed-by: Maurice Ma <maurice.ma@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-21-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 21:  30d69fe146cc ! 21:  43f2c9f8eb94 .mailmap: Add an entry for Michael Kubacki
>      @@ -11,6 +11,7 @@
>           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>
>      +    Message-Id: <20200106115415.11624-22-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 22:  2598f7175eb4 ! 22:  266efa6b296c .mailmap: Add an entry for Ming Tan
>      @@ -11,6 +11,7 @@
>           Cc: Ming Tan <ming.tan@intel.com>
>           Reviewed-by: Ming Tan <ming.tan@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-23-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 23:  535592f359d5 ! 23:  21429c1566fb .mailmap: Add an entry for Nikolai Saoukh
>      @@ -11,6 +11,7 @@
>           Cc: Nikolai Saoukh <nms@otdel-1.org>
>           Reviewed-by: Nikolai Saoukh <nms@otdel-1.org>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-24-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 24:  e3d5d0309650 ! 24:  a292d6c8ef31 .mailmap: Add an entry for Philippe Mathieu-Daudé
>      @@ -1,6 +1,6 @@
>       Author: Philippe Mathieu-Daude <philmd@redhat.com>
>       
>      -    .mailmap: Add an entry for Philippe Mathieu-Daudé
>      +    .mailmap: Add an entry for Philippe Mathieu-Daude
>       
>           We use .mailmap to display contributors email addresses in an
>           uniform format.
>      @@ -10,6 +10,8 @@
>       
>           Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-25-philmd@redhat.com>
>      +    [lersek@redhat.com: translit subject to ASCII to suppress PatchCheck.py]
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 25:  2ca124768e5a ! 25:  80f7c1b46408 .mailmap: Add an entry for Ray Ni
>      @@ -11,6 +11,7 @@
>           Cc: Ray Ni <ray.ni@intel.com>
>           Reviewed-by: Ray Ni <ray.ni@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-26-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 26:  c1cb9e02b79d ! 26:  ad12178c3dc1 .mailmap: Add an entry for Samer El-Haj-Mahmoud
>      @@ -12,6 +12,7 @@
>           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>
>      +    Message-Id: <20200106115415.11624-27-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 27:  c24088eb64f6 ! 27:  088573c97381 .mailmap: Add an entry for Shenglei Zhang
>      @@ -11,6 +11,7 @@
>           Cc: Shenglei Zhang <shenglei.zhang@intel.com>
>           Reviewed-by: Shenglei Zhang <shenglei.zhang@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-28-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 28:  ef26ef691e4e ! 28:  0e660ee7a179 .mailmap: Add an entry for Star Zeng
>      @@ -11,6 +11,7 @@
>           Cc: Star Zeng <star.zeng@intel.com>
>           Reviewed-by: Star Zeng <star.zeng@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-29-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 29:  cee7d719359a ! 29:  76b51586f4dc .mailmap: Add an entry for Vitaly Cheptsov
>      @@ -11,6 +11,7 @@
>           Cc: Vitaly Cheptsov <vit9696@protonmail.com>
>           Reviewed-by: Vitaly Cheptsov <vit9696@protonmail.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-30-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 30:  540df330a618 ! 30:  c751368c371a .mailmap: Add an entry for Vladimir Olovyannikov
>      @@ -11,6 +11,7 @@
>           Cc: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
>           Reviewed-by: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-31-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 31:  083b6b1db881 ! 31:  d96c7befc08d .mailmap: Add an entry for Yonghong Zhu
>      @@ -11,6 +11,7 @@
>           Cc: Yonghong Zhu <yonghong.zhu@intel.com>
>           Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-32-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> 32:  3b12182e47a5 ! 32:  0ef6fbbd114e .mailmap: Add an entry for Yu-Chen Lin
>      @@ -11,6 +11,7 @@
>           Cc: Yu-Chen Lin <yuchenlin@synology.com>
>           Reviewed-by: Yu-Chen Lin <yuchenlin@synology.com>
>           Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>      +    Message-Id: <20200106115415.11624-33-philmd@redhat.com>
>       
>       diff --git a/.mailmap b/.mailmap
>       --- a/.mailmap
> ---*---
> 
> Thanks!
> Laszlo
>