Commit 8d025e20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'erofs-for-6.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs 

Pull erofs fixes from Gao Xiang:

 - Add a new reviewer Sandeep Dhavale to build a healthier community

 - Drop experimental warning for FSDAX

* tag 'erofs-for-6.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  MAINTAINERS: erofs: add myself as reviewer
  erofs: drop experimental warning for FSDAX
parents 4076fa16 7557d296

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7940,6 +7940,7 @@ M: Gao Xiang <xiang@kernel.org> 
M:	Chao Yu <chao@kernel.org>

R:	Yue Hu <huyue2@coolpad.com>

R:	Jeffle Xu <jefflexu@linux.alibaba.com>

R:	Sandeep Dhavale <dhavale@google.com>

L:	linux-erofs@lists.ozlabs.org

S:	Maintained

W:	https://erofs.docs.kernel.org

fs/erofs/super.c

+0 −1
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ static bool erofs_fc_set_dax_mode(struct fs_context *fc, unsigned int mode) 


	switch (mode) {

	case EROFS_MOUNT_DAX_ALWAYS:

		warnfc(fc, "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");

		set_opt(&ctx->opt, DAX_ALWAYS);

		clear_opt(&ctx->opt, DAX_NEVER);

		return true;