From ffcf1b25bf274b4ec5c8915d58cac66a780c6445 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 30 Jul 2021 20:47:25 -0700
Subject: [PATCH] meta: add mailmap entry for dmabupt

This consolidates two email addresses/entries in AUTHORS into one.

PR-URL: https://github.com/nodejs/node/pull/39596
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 2f1a49124a7..3fc88b0a804 100644
--- a/.mailmap
+++ b/.mailmap
@@ -445,6 +445,7 @@ Wilson Lin <wla80@sfu.ca>
 Wyatt Preul <wpreul@gmail.com>
 Xavier J Ortiz <xavier.ortiz.ch@gmail.com>
 xiaoyu <306766053@qq.com>
+Xu Meng <dmabupt@gmail.com> <mengxumx@cn.ibm.com>
 Yael Hermon <yaelherm@gmail.com> <yaelhe@wix.com>
 ycjcl868 <45808948@qq.com> <chaolinjin@gmail.com>
 Yingchen Xue <yingchenxue@qq.com>
diff --git a/AUTHORS b/AUTHORS
index 3990eb9e001..33e8891906e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2793,7 +2793,7 @@ Gabriela Niño <gabynr@gmail.com>
 Mike MacCana <mike.maccana@gmail.com>
 Tim Baverstock <tim.baverstock@corp.badoo.com>
 Walle Cyril <cyril.walle@protonmail.com>
-Xu Meng <mengxumx@cn.ibm.com>
+Xu Meng <dmabupt@gmail.com>
 Samuel Attard <sattard@slack-corp.com>
 Ben L. Titzer <titzer@google.com>
 Ojasvi Monga <ojasvi@Ojasvis-MacBook-Air.local>
@@ -3031,7 +3031,6 @@ Sk Sajidul Kadir <sheikh.sajid522@gmail.com>
 Bartlomiej Brzozowski <bart.brzozowski@janeasystems.com>
 Saajan <saajan.sn@gmail.com>
 Yash Ladha <yashladhapankajladha123@gmail.com>
-Xu Meng <dmabupt@gmail.com>
 Alex R <alexei.rudenko@gmail.com>
 Hachimi Aa (Sfeir) <hachimi.aa@sfeir.com>
 Daniel Estiven Rico Posada <danielrico.posada@gmail.com>