From 5225df1872447a9110b18529e341caedeb08a1cf Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Fri, 26 Mar 2021 16:49:30 +0800 Subject: mailmap: update email address for Alex Shi Add my kernel.org address for old email address. Signed-off-by: Alex Shi Cc: Andrew Morton Cc: Jonathan Corbet Cc: Kees Cook Cc: Leon Romanovsky Cc: Thomas Bogendoerfer Cc: Alexander Lobakin Cc: linux-kernel@vger.kernel.org Link: https://lore.kernel.org/r/1616748571-52058-1-git-send-email-alex.shi@linux.alibaba.com Signed-off-by: Jonathan Corbet --- .mailmap | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 85b93cdefc87..608ce1e5bef7 100644 --- a/.mailmap +++ b/.mailmap @@ -25,8 +25,9 @@ Alexandre Belloni Alexei Starovoitov Alexei Starovoitov -Alex Shi -Alex Shi +Alex Shi +Alex Shi +Alex Shi Al Viro Al Viro Andi Kleen -- cgit v1.2.3-59-g8ed1b From 0072f6c37f02071821eb2135b80daa404d783704 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 9 Apr 2021 13:14:53 +0200 Subject: mailmap: Update email address for Nicolas Saenz Add my kernel.org address for old email address. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Florian Fainelli --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 85b93cdefc87..f2c1a871835e 100644 --- a/.mailmap +++ b/.mailmap @@ -255,6 +255,8 @@ Nguyen Anh Quynh Nicolas Ferre Nicolas Pitre Nicolas Pitre +Nicolas Saenz Julienne +Nicolas Saenz Julienne Oleksij Rempel Oleksij Rempel Oleksij Rempel -- cgit v1.2.3-59-g8ed1b