From: Philippe Mathieu-Daudé <f4...@amsat.org> These authors have some incorrect author email field. For each of them, there is one commit with the replaced entry.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> Signed-off-by: Alex Bennée <alex.ben...@linaro.org> Acked-by: Stefan Berger <stef...@linux.ibm.com> Acked-by: Erik Smit <erik.lucas.s...@gmail.com> Message-Id: <20201006160653.2391972-13-f4...@amsat.org> Message-Id: <20201007160038.26953-19-alex.ben...@linaro.org> diff --git a/.mailmap b/.mailmap index b914c9e290..663819fb01 100644 --- a/.mailmap +++ b/.mailmap @@ -85,6 +85,7 @@ Christophe Lyon <christophe.l...@st.com> Collin L. Walling <wall...@linux.ibm.com> Daniel P. Berrangé <berra...@redhat.com> Eduardo Otubo <ot...@redhat.com> +Erik Smit <erik.lucas.s...@gmail.com> Fabrice Desclaux <fabrice.descl...@cea.fr> Fernando Luis Vázquez Cao <fernando...@lab.ntt.co.jp> Fernando Luis Vázquez Cao <ferna...@oss.ntt.co.jp> @@ -142,6 +143,7 @@ Roger Pau Monné <roger....@citrix.com> Shin'ichiro Kawasaki <kawas...@juno.dti.ne.jp> Shin'ichiro Kawasaki <shinichiro.kawas...@wdc.com> Sochin Jiang <sochin.ji...@huawei.com> +Stefan Berger <stef...@linux.vnet.ibm.com> <stef...@linux.ibm.com> Takashi Yoshii <takas...@ops.dti.ne.jp> Thomas Huth <th...@redhat.com> Thomas Knych <thoma...@google.com> -- 2.20.1
