diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 16:24:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 16:24:18 -0700 |
commit | 7aed4d57b113f81214bea1ddb10480f620ade800 (patch) | |
tree | 3c7c7a834cbd90091f6212a0a59c42422aeeddd1 /MAINTAINERS | |
parent | a58e203530ebdf6e5413bebc7f976d756188a4b5 (diff) | |
parent | 8215d5b7f15f8643bf12fe005b2bc0cc322aff62 (diff) |
Merge tag 'erofs-for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
Pull erofs updates from Gao Xiang:
"No noticable change available for this cycle. Just a bugfix related to
sb chksum feature, two minor cleanups and Chao's email address update:
- fix wrong error code overwritten due to sb checksum feature
- two minor cleanups
- update Chao's email address"
* tag 'erofs-for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
MAINTAINERS: erofs: update my email address
erofs: clean up file headers & footers
erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
erofs: fix error return code in erofs_read_superblock()
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8708efec44b4..8ae6ea3b99fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6786,7 +6786,7 @@ F: include/video/s1d13xxxfb.h EROFS FILE SYSTEM M: Gao Xiang <xiang@kernel.org> -M: Chao Yu <yuchao0@huawei.com> +M: Chao Yu <chao@kernel.org> L: linux-erofs@lists.ozlabs.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git |