From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 4844D1F66E for ; Sun, 16 Aug 2020 15:36:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728346AbgHPPeE (ORCPT ); Sun, 16 Aug 2020 11:34:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726407AbgHPPeB (ORCPT ); Sun, 16 Aug 2020 11:34:01 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1F10C061786 for ; Sun, 16 Aug 2020 08:34:00 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id w25so14768508ljo.12 for ; Sun, 16 Aug 2020 08:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4YOE5lxlhvw1ehNaNLm3fkmZ+ybBqVRWtOR8TIt6Ulk=; b=t8DGOiPbSOcjQxHuVj8uw+To+hfdk9toiI8GgXNgUa4taC9gucYDfZ/xT5R632PCU2 jz/yhO+GaTJqer6l+YlY8RuE7pstCEwV436d0hPP9zjq6ct9qD+YhOECHFIruSet6qcb TCjaijJg6w8AiVETsDdVREGkMm2k0A2rJaz896b9RxU/TIDITAcSXFoedxc0l8U5qgLb xqrM25SbAwCuYtCqTxuBWfxwywYBsLb0oRxEJ04B2I2bAKNAAe6Gmmeyq3ST8Gyne+HQ lJtRF5XYgi9jVzaQovNWAJiZmaWPzvtebq5tAahDImO7S6f8PHy5smQx0fPzw1RsSEub +vaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4YOE5lxlhvw1ehNaNLm3fkmZ+ybBqVRWtOR8TIt6Ulk=; b=MnebyOegs7EREBRzMVjbR/i7zmk8iN/Eb3NyTGastPrY8CFQSw+MwpSJgRu0rhEbDU I1QnbvdUbXFn51NidFmKJdVPthVucVSjPxiutmY5Vgxdh4thGrGIOJYEpBoJerhayLhI fDXJMPmIaYgfysf/TqA/yc93mWjCsLhAYrX2vn/QxWPPVlzJnOUR/LVHMsOs/ABt58j6 VUUh5wU2Ks3gCsRoVDHSnQ2a1A5yIQmkQYqENpKYzOkxRZu+xz+8K37q8K+A1zwkIqzI mQga1c0up5JZqbuB7RR5oJfACYgmXDiIiUEf+ueCtcsqqBtcYt6AFJccPET18INiRLME bHhA== X-Gm-Message-State: AOAM531kBkp73q7YOn6n39TSRDbp2GQ8agXDdmUpO1YBGha5PGC2cUSF /tSBCIsWm4lCAspEHgg+GhyDJIgZJKwoXA== X-Google-Smtp-Source: ABdhPJyXSNIu7XslLrVP9e5l72UslpZqVZPuNH1PY1UKVbO0Lx+CIO2pPAOghkCJADAcHYXZC678mw== X-Received: by 2002:a05:651c:238:: with SMTP id z24mr5682138ljn.172.1597592036666; Sun, 16 Aug 2020 08:33:56 -0700 (PDT) Received: from localhost.localdomain (92-33-153-30.customers.ownit.se. [92.33.153.30]) by smtp.gmail.com with ESMTPSA id y28sm4110026lfl.15.2020.08.16.08.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Aug 2020 08:33:56 -0700 (PDT) From: =?UTF-8?q?Martin=20=C3=85gren?= To: git@vger.kernel.org Cc: Andreas Schwab , Andreas Schwab , Birger Skogeng Pedersen , Birger Skogeng Pedersen , Brandon Williams , Brandon Williams , Damien Robert , Damien Robert , Ed Maste , Ed Maste , Fangyi Zhou , Fangyi Zhou , Jiang Xin , Jiang Xin , Kevin Willford , Kevin Willford , Peter Kaestle , Peter Kaestle , Sun Chao , Sun Chao <16657101987@163.com>, Junio C Hamano , Jeff King Subject: [PATCH v2] Update .mailmap Date: Sun, 16 Aug 2020 17:30:37 +0200 Message-Id: <20200816153037.1143576-1-martin.agren@gmail.com> X-Mailer: git-send-email 2.28.0.277.g9b3c35fffd In-Reply-To: <20200805065408.1242617-1-martin.agren@gmail.com> References: <20200805065408.1242617-1-martin.agren@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Similar to a35b13fce0 ("Update .mailmap", 2018-11-09), make 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. By request, don't add an entry for Andreas Schwab. For Brandon Williams, use the e-mail address they gave in a62527b0e5 ("mailmap: update brandon williams's email address", 2018-12-07). Peter Kaestle has used different addresses to separate work-time and spare-time contributions, but similar to 3fa0e04667 ("mailmap: add an additional email address for brian m. carlson", 2020-02-20), has asked that we attribute those commits to the same person. Use the by far most common e-mail address: * Jiang Xin Use the most recent e-mail address: * Birger Skogeng Pedersen * Ed Maste * Fangyi Zhou * Kevin Willford * Peter Kaestle Use the one they used for their "Signed-off-by": * Damien Robert * Sun Chao Acked-by: Ed Maste Acked-by: Damien Robert Signed-off-by: Martin Ågren --- .mailmap | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index bde7aba756..f3b335af20 100644 --- a/.mailmap +++ b/.mailmap @@ -27,8 +27,10 @@ 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 @@ -45,6 +47,7 @@ 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 +67,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 @@ -107,6 +112,8 @@ Jeff Muizelaar Jens Axboe Jens Axboe Jens Lindström Jens Lindstrom +Jiang Xin +Jiang Xin Jim Meyering Joachim Berdal Haga Joachim Jablon @@ -142,6 +149,7 @@ Kazuki Saitoh kazuki saitoh Keith Cascio Kent Engstrom Kevin Leung +Kevin Willford Kirill Smelkov Kirill Smelkov Knut Franke @@ -209,6 +217,7 @@ Paul Mackerras Paul Mackerras Peter Baumann Peter Baumann +Peter Kaestle Peter Krefting Peter Krefting Petr Baudis @@ -256,6 +265,7 @@ Steven Grimm Steven Grimm koreth@midwinter.com Steven Walter Steven Walter +Sun Chao <16657101987@163.com> Sven Verdoolaege Sven Verdoolaege SZEDER Gábor -- 2.28.0.277.g9b3c35fffd