summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-03-27 20:24:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-03-27 20:24:09 -0700
commit8d025e2092e29bfd13e56c78e22af25fac83c8ec (patch)
treec4f4662b9fde1eaeebd00b4e8496dca434147738
parent4076fa161217fcd64a578ca04586c4be728cb004 (diff)
parent7557d296ad439f66a87cd34917af2a4172517826 (diff)
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
-rw-r--r--MAINTAINERS1
-rw-r--r--fs/erofs/super.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 079a86e680bc..96496dbcae6d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 69308fd73e4a..c0eb139adb07 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -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;