[PATCH 0/2] .mailmap: Fixes since v5.1

[PATCH 0/2] .mailmap: Fixes since v5.1

[Philippe Mathieu-Daudé]

Fix incorrect entries committed during 5.1-5.2.

To the developers Cc'ed:

If you agree with your entry, please reply with a Reviewed-by /
Acked-by tag. If you disagree or doesn't care, please either
reply with Nack-by or ignore this patch.
I'll repost in 2 weeks as formal patch (not RFC) with only the
entries acked by their author.

Regards,

Phil.

Philippe Mathieu-Daudé (2):
  .mailmap: Correct Marek Dolata name
  .mailmap: Fix more contributor entries

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

-- 
2.26.2

[PATCH 1/2] .mailmap: Correct Marek Dolata name

[Philippe Mathieu-Daudé]

Commit 5a07192a04 has email instead of name, triggering
warnings when using git-dm. Use the same name Marek Dolata
uses in other commits.

Cc: Marek Dolata <mkdolata@us.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index b914c9e290..2b9f3b4aa5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -119,6 +119,7 @@ Luc Michel <luc.michel@git.antfield.fr>
 Luc Michel <luc.michel@greensocs.com>
 Marc Marí <marc.mari.barcelo@gmail.com>
 Marc Marí <markmb@redhat.com>
+Marek Dolata <mkdolata@us.ibm.com>
 Michael Avdienko <whitearchey@gmail.com>
 Michael S. Tsirkin <mst@redhat.com>
 Munkyu Im <munkyu.im@samsung.com>
-- 
2.26.2

[RFC PATCH 2/2] .mailmap: Fix more contributor entries

[Philippe Mathieu-Daudé]

These authors have some incorrect author email field.
For each of them, there is one commit with the replaced
entry.

Cc: Anup Patel <anup.patel@wdc.com>
Cc: Andrew Melnychenko <andrew@daynix.com>
Cc: David Carlier <devnexen@gmail.com>
Cc: Erik Smit <erik.lucas.smit@gmail.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: Pan Nengyuan <pannengyuan@huawei.com>
Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
To the developers Cc'ed: If you agree with your entry, please
reply with a Reviewed-by/Acked-by tag. If you disagree or doesn't
care, please either reply with Nack-by or ignore this patch.
I'll repost in 2 weeks as formal patch (not RFC) with only the
entries acked by their author.
---
 .mailmap | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.mailmap b/.mailmap
index 2b9f3b4aa5..dea358ea7d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -62,9 +62,11 @@ Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
 Aaron Lindsay <aaron@os.amperecomputing.com>
+Anup Patel <anup.patel@wdc.com>
 Alexey Gerasimenko <x1917x@gmail.com>
 Alex Ivanov <void@aleksoft.net>
 Andreas Färber <afaerber@suse.de>
+Andrew Melnychenko <andrew@daynix.com>
 Bandan Das <bsd@redhat.com>
 Benjamin MARSILI <mlspirat42@gmail.com>
 Benoît Canet <benoit.canet@gmail.com>
@@ -84,7 +86,9 @@ Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
 Christophe Lyon <christophe.lyon@st.com>
 Collin L. Walling <walling@linux.ibm.com>
 Daniel P. Berrangé <berrange@redhat.com>
+David Carlier <devnexen@gmail.com>
 Eduardo Otubo <otubo@redhat.com>
+Erik Smit <erik.lucas.smit@gmail.com>
 Fabrice Desclaux <fabrice.desclaux@cea.fr>
 Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
 Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
@@ -119,6 +123,7 @@ Luc Michel <luc.michel@git.antfield.fr>
 Luc Michel <luc.michel@greensocs.com>
 Marc Marí <marc.mari.barcelo@gmail.com>
 Marc Marí <markmb@redhat.com>
+Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
 Marek Dolata <mkdolata@us.ibm.com>
 Michael Avdienko <whitearchey@gmail.com>
 Michael S. Tsirkin <mst@redhat.com>
@@ -128,6 +133,7 @@ Nicholas Thomas <nick@bytemark.co.uk>
 Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
 Orit Wasserman <owasserm@redhat.com>
 Paolo Bonzini <pbonzini@redhat.com>
+Pan Nengyuan <pannengyuan@huawei.com>
 Pavel Dovgaluk <dovgaluk@ispras.ru>
 Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
 Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
@@ -143,6 +149,7 @@ Roger Pau Monné <roger.pau@citrix.com>
 Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
 Sochin Jiang <sochin.jiang@huawei.com>
+Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
 Takashi Yoshii <takasi-y@ops.dti.ne.jp>
 Thomas Huth <thuth@redhat.com>
 Thomas Knych <thomaswk@google.com>
-- 
2.26.2

Re: [RFC PATCH 2/2] .mailmap: Fix more contributor entries

[Stefan Berger]

On 10/4/20 1:26 PM, Philippe Mathieu-Daudé wrote:
> These authors have some incorrect author email field.
> For each of them, there is one commit with the replaced
> entry.
>
> Cc: Anup Patel <anup.patel@wdc.com>
> Cc: Andrew Melnychenko <andrew@daynix.com>
> Cc: David Carlier <devnexen@gmail.com>
> Cc: Erik Smit <erik.lucas.smit@gmail.com>
> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
> Cc: Pan Nengyuan <pannengyuan@huawei.com>
> Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Acked-by: Stefan Berger <stefanb@linux.ibm.com>

[PATCH 3/2] .mailmap: Correct Yuval Shaia email address

[Philippe Mathieu-Daudé]

Fix Yuval Shaia email in commits f93cfdc583 and 1d2695ef02
to avoid gid-dm warnings.

Cc: Yuval Shaia <yuval.shaia.ml@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index dea358ea7d..b86359bd10 100644
--- a/.mailmap
+++ b/.mailmap
@@ -173,6 +173,7 @@ Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
 YunQiang Su <syq@debian.org>
 YunQiang Su <ysu@wavecomp.com>
 Yuri Pudgorodskiy <yur@virtuozzo.com>
+Yuval Shaia <yuval.shaia.ml@gmail.com> <yuval.shaia.ml.gmail.com>
 Zhengui Li <lizhengui@huawei.com>
 Zhenwei Pi <pizhenwei@bytedance.com>
 Zhenwei Pi <zhenwei.pi@youruncloud.com>
-- 
2.26.2

Re: [PATCH 0/2] .mailmap: Fixes since v5.1

[Erik Smit]

On Sun, 4 Oct 2020 at 19:26, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Fix incorrect entries committed during 5.1-5.2.
>
> To the developers Cc'ed:
>
> If you agree with your entry, please reply with a Reviewed-by /
> Acked-by tag. If you disagree or doesn't care, please either
> reply with Nack-by or ignore this patch.
> I'll repost in 2 weeks as formal patch (not RFC) with only the
> entries acked by their author.
>
> Regards,
>
> Phil.
>
> Philippe Mathieu-Daudé (2):
>   .mailmap: Correct Marek Dolata name
>   .mailmap: Fix more contributor entries
>
>  .mailmap | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> --
> 2.26.2

Acked-by: Erik Smit <erik.lucas.smit@gmail.com>

Re: [RFC PATCH 2/2] .mailmap: Fix more contributor entries

[Pan Nengyuan]

On 2020/10/5 1:26, Philippe Mathieu-Daudé wrote:
> These authors have some incorrect author email field.
> For each of them, there is one commit with the replaced
> entry.
> 
> Cc: Anup Patel <anup.patel@wdc.com>
> Cc: Andrew Melnychenko <andrew@daynix.com>
> Cc: David Carlier <devnexen@gmail.com>
> Cc: Erik Smit <erik.lucas.smit@gmail.com>
> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
> Cc: Pan Nengyuan <pannengyuan@huawei.com>
> Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---

Acked-by: Pan Nengyuan <pannengyuan@huawei.com>