[PATCH 1/2] mailmap: update email address for Alex Shi

From: Alex Shi
Date: Fri Mar 26 2021 - 04:50:34 EST


Add my kernel.org address for old email address.

Signed-off-by: Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Leon Romanovsky <leon@xxxxxxxxxx>
Cc: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
Cc: Alexander Lobakin <alobakin@xxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
.mailmap | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 85b93cdefc87..608ce1e5bef7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,8 +25,9 @@ Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx> <alexandre.belloni@free-electr
Alexei Starovoitov <ast@xxxxxxxxxx> <alexei.starovoitov@xxxxxxxxx>
Alexei Starovoitov <ast@xxxxxxxxxx> <ast@xxxxxx>
Alexei Starovoitov <ast@xxxxxxxxxx> <ast@xxxxxxxxxxxx>
-Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx> <alex.shi@xxxxxxxxx>
-Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx> <alex.shi@xxxxxxxxxx>
+Alex Shi <alexs@xxxxxxxxxx> <alex.shi@xxxxxxxxx>
+Alex Shi <alexs@xxxxxxxxxx> <alex.shi@xxxxxxxxxx>
+Alex Shi <alexs@xxxxxxxxxx> <alex.shi@xxxxxxxxxxxxxxxxx>
Al Viro <viro@xxxxxxxxxxxxxxxx>
Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Andi Kleen <ak@xxxxxxxxxxxxxxx> <ak@xxxxxxx>
--
2.29.GIT