From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F4EFC33CB1 for ; Sat, 18 Jan 2020 14:33:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6C7432469A for ; Sat, 18 Jan 2020 14:33:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D1JUd6IP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C7432469A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isp9r-0005gE-0U for qemu-devel@archiver.kernel.org; Sat, 18 Jan 2020 09:33:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47993) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isp96-0005ED-DR for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:32:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isp92-0007dO-N5 for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:32:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21249 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isp92-0007cR-JW for qemu-devel@nongnu.org; Sat, 18 Jan 2020 09:32:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579357931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=leH5PFjtgnyrCU8Sr/mNN2FRMr3J4q0bmvC03UZKDuc=; b=D1JUd6IPg5BumsFC4sS3lg8xcvO3gkiGng/dfRtPfj04uXu6skSoXls55F3vOiHDJ9DJHk oFWyCwOGrKLCoV6N9zDgDPvf8Vcxh7woDDFQngvj54ZjoWr3pJ6YZ3jal5w8CY6o3akjyf BBijag6qvY4iDtsI4HJaZAfhaqA49MI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-FuUjBDJRPg21h6O5ygdnnQ-1; Sat, 18 Jan 2020 09:32:10 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07062800D41; Sat, 18 Jan 2020 14:32:09 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-59.brq.redhat.com [10.40.204.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7EBBA5C1D4; Sat, 18 Jan 2020 14:32:04 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] mailmap: Add more entries to sanitize 'git log' output Date: Sat, 18 Jan 2020 15:32:02 +0100 Message-Id: <20200118143202.29187-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: FuUjBDJRPg21h6O5ygdnnQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Markus Armbruster , Marek Dolata Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Most of these developers have the Signed-off-by tag properly written, but not the author/committer name. Fix this. Also we incorrectly wrote Arei Gonglei name, update and reorder. The committer name/email is displayed when using: $ git log --format=3Dfuller (which can be set in git-config setting format.pretty=3Dfuller). Example of commits with miswritten committer email: 3b08098b40 76349f5ba8 eb83c2030a 572992eefa 0d4abda8f7 Note: git-log does not use this file by default until you specify the --use-mailmap flag: $ git log --use-mailmap Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: - Added Marek Dolata (commit 5a07192a0) - Describe git-log --format=3Dfuller - Added Markus R-b --- .mailmap | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 3816e4effe..cf981a3ec0 100644 --- a/.mailmap +++ b/.mailmap @@ -56,6 +56,10 @@ Aaron Lindsay Alexey Gerasimenko Alex Ivanov Andreas F=C3=A4rber +Andreas F=C3=A4rber +Andreas F=C3=A4rber +Arei Gonglei +Arei Gonglei Bandan Das Benjamin MARSILI Beno=C3=AEt Canet @@ -67,27 +71,36 @@ Brad Smith Brijesh Singh Brilly Wu C=C3=A9dric Vincent +Chai Wen +Chaojian Hu CheneyLin +Chen Fan Chen Gang Chen Gang Chen Gang Chen Wei-Ren Christophe Lyon +Christoph Hellwig Collin L. Walling Daniel P. Berrang=C3=A9 +Disheng Su +Dunrong Huang Eduardo Otubo Fabrice Desclaux Fernando Luis V=C3=A1zquez Cao Fernando Luis V=C3=A1zquez Cao Gautham R. Shenoy Gautham R. Shenoy -Gonglei (Arei) Guang Wang Hailiang Zhang Herv=C3=A9 Poussineau +Hiroyuki Obinata Jakub Jerm=C3=A1=C5=99 Jakub Jerm=C3=A1=C5=99 +Jay Zhou Jean-Christophe Dubois +Jean-Christophe Dubois +Jia Lina Jind=C5=99ich Makovi=C4=8Dka John Arbuckle Juha Riihim=C3=A4ki @@ -96,9 +109,11 @@ Jun Li Laurent Vivier Leandro Lupori Li Guang +Lili Huang Liming Wang linzhecheng Liran Schour +Li Tianqing Liu Yu Liu Yu Li Zhang @@ -110,13 +125,17 @@ Luc Michel Luc Michel Marc Mar=C3=AD Marc Mar=C3=AD +Marek Dolata Michael Avdienko Michael S. Tsirkin +Michael S. Tsirkin +Michael Tokarev Munkyu Im Nicholas Bellinger Nicholas Thomas Nikunj A Dadhania Orit Wasserman +Pan Nengyuan Paolo Bonzini Pavel Dovgaluk Pavel Dovgaluk @@ -124,15 +143,23 @@ Pavel Dovgaluk Peter Crosthwaite Peter Crosthwaite Peter Crosthwaite +Peter Maydell Prasad J Pandit Prasad J Pandit Qiao Nuohan Reimar D=C3=B6ffinger Remy Noel +Richard Henderson Roger Pau Monn=C3=A9 Shin'ichiro Kawasaki Shin'ichiro Kawasaki +Siwei Zhuang +Sochin Jiang Sochin Jiang +Stefan Berger +Stefan Weil +Stefan Weil +Stefan Weil Takashi Yoshii Thomas Huth Thomas Knych @@ -150,6 +177,7 @@ Wenshuang Ma Xiaoqiang Zhao Xinhua Cao Xiong Zhang +Ying Fang Yin Yin yuchenlin YunQiang Su --=20 2.21.1