From patchwork Fri Sep 10 13:02:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fangyi Zhou X-Patchwork-Id: 12485107 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=-21.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 6ADE3C433F5 for ; Fri, 10 Sep 2021 13:02:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E91A61059 for ; Fri, 10 Sep 2021 13:02:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233256AbhIJNEE (ORCPT ); Fri, 10 Sep 2021 09:04:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233185AbhIJNED (ORCPT ); Fri, 10 Sep 2021 09:04:03 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2795BC061574 for ; Fri, 10 Sep 2021 06:02:52 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id u15-20020a05600c19cf00b002f6445b8f55so1357168wmq.0 for ; Fri, 10 Sep 2021 06:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fangyi-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=//kH8LfMD8D+Rh3K+0fl87sff3S6wTNEAzdO2wfkmlo=; b=gF9aBNhGEhQRQDIKhMB0GySTC6N3g6VAB9xs0im49PeGYmfdnrrpGVF+3ZnOdJ89wq D6hwok8L9oEfprTR5Kq1w/4wXd4UbAHwgQpTdGu6CPQ15IWVOdX2fIFTZGTMLP9TE7Ay BMz0mCudipxZKxydYLXNCi+OW0+x0hB0eI8VRDunHBo0Y8oKpRNmhC0v5y0PecYod7JR CEcdaKuIxAzXfCBcAnm+O6/gHJF+3cb3AjwSSOBdEVpOfIZR+QeIjiGrbYwEpXLVJUR/ QPwtI4wDyg1YSqosGUKCxt+OEOq5r2qqhC27+Fg98GSUJc7VQrDnSSHVraSicu7zIMp5 6HKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=//kH8LfMD8D+Rh3K+0fl87sff3S6wTNEAzdO2wfkmlo=; b=5AbTdD7S+AkCxVXhRooEpyPET0dHYMn+We7mTNg3WNynhA8gcEzBGMHcoB8e5xsdjl UCHc93rALqIu6ykbxoDazg+HLzCypELyKjwxIiOLDkeTZdghdYZz82SY8yW/WN5WfKHQ MsH1T4/6sM2rake4vEiy3LwrmTc4bSixO9IYHk2nPIFQes74m/fmfj5xn+8eFQhvQp1n CsM1pDwVrNoblRoPvUh3hl++/LNjV+7qII3v9hrbDw/rTr1ZPLwp7vvYWksNs6oz1C7M 7FbfsQUyLyVhkTvJWEFUHP8wwmMjksJqaobtwwN4vgAiOeFTg27LezN8HoJixJ4ocUfB LpbQ== X-Gm-Message-State: AOAM531Vyiu6IYLnA8htcceHMtCBKJhUe5aw+qqkNqBWt2q0o9ORLmoP 9Si21Ej7b20+HOMqMoExCPftTM1chpAlBz5Q X-Google-Smtp-Source: ABdhPJxCz3Znl2MuIvPTAKrl6PXzj3mBvDFuOIBVgZu5M5PTIc3oGgzWp+bJRuG9KBkZCkrpNF4KeQ== X-Received: by 2002:a7b:c751:: with SMTP id w17mr8475355wmk.162.1631278970260; Fri, 10 Sep 2021 06:02:50 -0700 (PDT) Received: from localhost.localdomain (cpc157871-brnt5-2-0-cust279.4-2.cable.virginm.net. [86.4.97.24]) by smtp.googlemail.com with ESMTPSA id n5sm4228001wmd.29.2021.09.10.06.02.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Sep 2021 06:02:49 -0700 (PDT) From: Fangyi Zhou To: git@vger.kernel.org Cc: Fangyi Zhou , Birger Skogeng Pedersen , Birger Skogeng Pedersen , Brandon Williams , Brandon Williams , CB Bailey , =?utf-8?q?Christopher_D=C3=ADaz_Riveros?= , =?utf-8?q?Christopher_D=C3=ADaz_Riveros?= , Ed Maste , =?utf-8?q?Jean-No=C3=ABl_Avila?= , Jean-Noel Avila , Jessica Clarke , Jiang Xin , Jiang Xin , Kazuhiro Kato , Kazuhiro Kato , Kevin Willford , Kevin Willford , Peter Kaestle , Peter Kaestle , Sibi Siddharthan , Sibi Siddharthan , =?utf-8?b?U2xhdmljYSA=?= =?utf-8?b?xJB1a2nEhw==?= , Slavica Djukic Subject: [PATCH] .mailmap: Update mailmap Date: Fri, 10 Sep 2021 14:02:36 +0100 Message-Id: <20210910130236.40101-1-me@fangyi.io> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Similar to a35b13fce0 (Update .mailmap, 2018-11-09). This patch makes the output of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing the current and preferred addresses for authors that appear with more than one address. Updated from <20200805065408.1242617-1-martin.agren@gmail.com>, taking into consideration of , and other replies. Use the by far most common e-mail address: * Brandon Williams * Jiang Xin Use the most recent e-mail address: * Birger Skogeng Pedersen * Christopher Díaz Riveros * Ed Maste * Fangyi Zhou * Jean-Noël Avila * Kevin Willford * Peter Kaestle Use the one from their "Signed-off-by": * Damien Robert * Kazuhiro Kato * Sibi Siddharthan Use the most recent name / name with correct accents: * CB Bailey * Christopher Díaz Riveros * Jessica Clarke * Slavica Đukić Do not merge: * Andreas Schwab Signed-off-by: Fangyi Zhou --- Please let me know if you approve those changes or not. If no reply is received, the entry will be added in comments. --- .mailmap | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 9c6a446bdf..ff0887d9e0 100644 --- a/.mailmap +++ b/.mailmap @@ -27,13 +27,16 @@ Ben Peart Ben Walton Benoit Sigoure Bernt Hansen +Birger Skogeng Pedersen Brandon Casey Brandon Williams +Brandon Williams brian m. carlson brian m. carlson brian m. carlson Bryan Larsen Bryan Larsen +CB Bailey Charles Bailey Cheng Renquan Chris Shoemaker Chris Wright @@ -41,10 +44,12 @@ Christian Ludwig Cord Seele Christian Couder Christian Stimming -Christopher Díaz Riveros Christopher Diaz Riveros +Christopher Díaz Riveros +Christopher Díaz Riveros Christopher Diaz Riveros Clemens Buchacher Clemens Buchacher Csaba Henk +Damien Robert Dan Johnson Dana L. How Dana L. How Dana How @@ -64,13 +69,15 @@ Derrick Stolee Derrick Stolee via GitGitGadget Đoàn Trần Công Danh Doan Tran Cong Danh Dirk Süsserott +Ed Maste Eric Blake Eric Hanchrow Eric S. Raymond Eric Wong Erik Faye-Lund Eyvind Bernhardsen -Fangyi Zhou Zhou Fangyi +Fangyi Zhou +Fangyi Zhou Zhou Fangyi Florian Achleitner Franck Bui-Huu Frank Lichtenheld @@ -102,11 +109,14 @@ Jason Riedy Jay Soffian Jean-Noël Avila Jean-Noel Avila Jean-Noël Avila Jean-Noël AVILA +Jean-Noël Avila Jean-Noel Avila Jeff King Jeff Muizelaar Jens Axboe Jens Axboe Jens Lindström Jens Lindstrom +Jessica Clarke James Clarke +Jiang Xin Jim Meyering Joachim Berdal Haga Joachim Jablon @@ -138,10 +148,12 @@ Karsten Blees Karsten Blees Kay Sievers Kay Sievers +Kazuhiro Kato Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung +Kevin Willford Kirill Smelkov Kirill Smelkov Knut Franke @@ -211,6 +223,7 @@ Peter Baumann Peter Krefting Peter Krefting +Peter Kaestle Petr Baudis Petr Baudis Phil Hord @@ -242,9 +255,11 @@ Sebastian Schuberth Seth Falcon Shawn O. Pearce Wei Shuyu Shuyu Wei +Sibi Siddharthan Sidhant Sharma Sidhant Sharma [:tk] Simon Hausmann Simon Hausmann +Slavica Đukić Slavica Djukic Stefan Beller Stefan Beller Stefan Naewe @@ -296,3 +311,7 @@ Yi-Jyun Pan anonymous anonymous İsmail Dönmez + +# Do not merge +# Andreas Schwab +# Andreas Schwab