summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-03-30 21:49:33 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2020-03-30 21:49:33 +0200
commit377ad0c28c1df7b0634e697f34bdea8325f39a66 (patch)
tree98e3aaa582c84ab4951836cabffcbd788f35e3ef /MAINTAINERS
parentMerge tag 'docs-5.7' of git://git.lwn.net/linux (diff)
parentMAINTAINERS: erofs: update my email address (diff)
downloadlinux-377ad0c28c1df7b0634e697f34bdea8325f39a66.tar.xz
linux-377ad0c28c1df7b0634e697f34bdea8325f39a66.zip
Merge tag 'erofs-for-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
Pull erofs updates from Gao Xiang: "Updates with a XArray adaptation, several fixes for shrinker and corrupted images are ready for this cycle. All commits have been stress tested with no noticeable smoke out and have been in linux-next as well. Summary: - Convert radix tree usage to XArray - Fix shrink scan count on multiple filesystem instances - Better handling for specific corrupted images - Update my email address in MAINTAINERS" * tag 'erofs-for-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs: MAINTAINERS: erofs: update my email address erofs: handle corrupted images whose decompressed size less than it'd be erofs: use LZ4_decompress_safe() for full decoding erofs: correct the remaining shrink objects erofs: convert workstn to XArray
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 953478c9a2eb..bbec6933a4b1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6248,7 +6248,7 @@ F: drivers/video/fbdev/s1d13xxxfb.c
F: include/video/s1d13xxxfb.h
EROFS FILE SYSTEM
-M: Gao Xiang <gaoxiang25@huawei.com>
+M: Gao Xiang <xiang@kernel.org>
M: Chao Yu <yuchao0@huawei.com>
L: linux-erofs@lists.ozlabs.org
S: Maintained