diff --git a/.mailmap b/.mailmap
index c91510544189d4..a9c031dab6896f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -429,6 +429,8 @@ Trivikram Kamat <trivikr.dev@gmail.com> <16024985+trivikr@users.noreply.github.c
 ttzztztz <ttzztztz@outlook.com> <yangziyue80@outlook.com>
 Tyler Larson <talltyler@gmail.com>
 Ujjwal Sharma <ryzokuken@disroot.org> <usharma1998@gmail.com>
+Ujjwal Sharma <ryzokuken@disroot.org> <ryzokuken@igalia.com>
+Uttam Pawar <upawar@gmail.com> <uttam.c.pawar@intel.com>
 Viktor Karpov <viktor.s.karpov@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Vladimir de Turckheim <vlad2t@hotmail.com>
@@ -445,6 +447,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 21e279a5f2ce10..e8c3e89fb08b0d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1255,7 +1255,7 @@ J Scott Chapman <scott8675309@gmail.com>
 Erez Weiss <ruggertech@gmail.com>
 Scott Smereka <scott.smereka@gmail.com>
 Fabrice Tatieze <fabrice.tatieze@nike.com>
-Uttam Pawar <uttam.c.pawar@intel.com>
+Uttam Pawar <upawar@gmail.com>
 Ben Lugavere <b.lugavere@gmail.com>
 Punit Buch <punit.buch@gmail.com>
 mark hughes <mrhughes@xogrp.com>
@@ -2672,7 +2672,6 @@ Amit Zur <sendwithchibo@gmail.com>
 Thang Tran <trankimthang279@gmail.com>
 Kai <Schweinepriester@users.noreply.github.com>
 Abhishek Agarwal <abhishek.agr31@gmail.com>
-Uttam Pawar <upawar@gmail.com>
 Jon Kunkee <jkunkee@microsoft.com>
 Mukul Khanna <mukul18khanna@gmail.com>
 Jarrod Connolly <jarrod@nestedquotes.ca>
@@ -2793,7 +2792,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>
@@ -3018,7 +3017,6 @@ Joe Pea <joe@trusktr.io>
 ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
 Mateusz Krawczuk <krawczukmat@gmail.com>
 Jonathan MERCIER <jmercier@cng.fr>
-Ujjwal Sharma <ryzokuken@igalia.com>
 Jichan <development@jc-lab.net>
 Hassaan Pasha <hassaan.pasha@teamo.io>
 Eric Dobbertin <eric@dairystatedesigns.com>
@@ -3031,7 +3029,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>