summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linux.alibaba.com>2021-03-26 16:49:31 +0800
committerJonathan Corbet <corbet@lwn.net>2021-03-31 13:52:25 -0600
commit2bb5baf9d22764fff6baca4c3ad93055848bbf03 (patch)
tree6535df29b0f8a0ad9ec0041b7c91052e575a5ce0
parent5225df1872447a9110b18529e341caedeb08a1cf (diff)
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 <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 Link: https://lore.kernel.org/r/1616748571-52058-2-git-send-email-alex.shi@linux.alibaba.com Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/translations/zh_CN/disclaimer-zh_CN.rst2
-rw-r--r--MAINTAINERS2
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 b5d38fedff6c..03b2096a5f8f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4195,7 +4195,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/