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

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

[Alex Shi]

Add my kernel.org address for old email address.

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Andrew Morton <akpm@linux-foundation.org> 
Cc: Jonathan Corbet <corbet@lwn.net> 
Cc: Kees Cook <keescook@chromium.org> 
Cc: Leon Romanovsky <leon@kernel.org> 
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> 
Cc: Alexander Lobakin <alobakin@pm.me> 
Cc: linux-kernel@vger.kernel.org 
---
 .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@bootlin.com> <alexandre.belloni@free-electr
 Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
 Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
 Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
-Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
-Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
+Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
+Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
+Alex Shi <alexs@kernel.org> <alex.shi@linux.alibaba.com>
 Al Viro <viro@ftp.linux.org.uk>
 Al Viro <viro@zenIV.linux.org.uk>
 Andi Kleen <ak@linux.intel.com> <ak@suse.de>
-- 
2.29.GIT

[PATCH 2/2] Docs/zh_CN: update Alex Shi new email address

[Alex Shi]

I am leaving Alibaba, udpate the old email address to new one.

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Harry Wei <harryxiyou@gmail.com> 
Cc: Alex Shi <alexs@kernel.org> 
Cc: Jonathan Corbet <corbet@lwn.net> 
Cc: linux-doc@vger.kernel.org 
Cc: linux-kernel@vger.kernel.org 
---
 Documentation/translations/zh_CN/disclaimer-zh_CN.rst | 2 +-
 MAINTAINERS                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/translations/zh_CN/disclaimer-zh_CN.rst b/Documentation/translations/zh_CN/disclaimer-zh_CN.rst
index dcf803ede85a..3c6db094a63c 100644
--- a/Documentation/translations/zh_CN/disclaimer-zh_CN.rst
+++ b/Documentation/translations/zh_CN/disclaimer-zh_CN.rst
@@ -6,4 +6,4 @@
 
 .. note::
      如果您发现本文档与原始文件有任何不同或者有翻译问题，请联系该文件的译者，
-     或者请求时奎亮的帮助：<alex.shi@linux.alibaba.com>。
+     或者请求时奎亮的帮助：<alexs@kernel.org>。
diff --git a/MAINTAINERS b/MAINTAINERS
index 728216e3919c..f4b60255f011 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4211,7 +4211,7 @@ F:	Documentation/dev-tools/checkpatch.rst
 
 CHINESE DOCUMENTATION
 M:	Harry Wei <harryxiyou@gmail.com>
-M:	Alex Shi <alex.shi@linux.alibaba.com>
+M:	Alex Shi <alexs@kernel.org>
 L:	xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)
 S:	Maintained
 F:	Documentation/translations/zh_CN/
-- 
2.29.GIT

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

[Jonathan Corbet]

Alex Shi <alex.shi@linux.alibaba.com> writes:

> Add my kernel.org address for old email address.
>
> Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>

Both applied, thanks.

jon