2021-03-26 08:51:24

by Alex Shi

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

Add my kernel.org address for old email address.

Signed-off-by: Alex Shi <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Leon Romanovsky <[email protected]>
Cc: Thomas Bogendoerfer <[email protected]>
Cc: Alexander Lobakin <[email protected]>
Cc: [email protected]
---
.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 <[email protected]> <alexandre.belloni@free-electr
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
-Alex Shi <[email protected]> <[email protected]>
-Alex Shi <[email protected]> <[email protected]>
+Alex Shi <[email protected]> <[email protected]>
+Alex Shi <[email protected]> <[email protected]>
+Alex Shi <[email protected]> <[email protected]>
Al Viro <[email protected]>
Al Viro <[email protected]>
Andi Kleen <[email protected]> <[email protected]>
--
2.29.GIT

2021-03-26 08:51:42

by Alex Shi

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

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

Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Alex Shi <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
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::
如果您发现本文档与原始文件有任何不同或者有翻译问题，请联系该文件的译者，
- 或者请求时奎亮的帮助：<[email protected]>。
+ 或者请求时奎亮的帮助：<[email protected]>。
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 <[email protected]>
-M: Alex Shi <[email protected]>
+M: Alex Shi <[email protected]>
L: [email protected] (subscribers-only)
S: Maintained
F: Documentation/translations/zh_CN/
--
2.29.GIT

2021-03-31 19:56:08

by Jonathan Corbet

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

Alex Shi <[email protected]> writes:

> Add my kernel.org address for old email address.
>
> Signed-off-by: Alex Shi <[email protected]>

Both applied, thanks.

jon