Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git tags/ovl-update-6.0 This is just a small update. There's a merge conflict with the mnt-userns series from Christian. This should be resolved by moving the "#ifdef CONFIG_FS_POSIX_ACL" up, to include the newly introduced ovl_idmap_posix_acl() helper. Thanks, Miklos --- Jiachen Zhang (1): ovl: drop WARN_ON() dentry is NULL in ovl_encode_fh() Miklos Szeredi (1): ovl: warn if trusted xattr creation fails William Dean (1): ovl: fix spelling mistakes Yang Li (1): ovl: fix some kernel-doc comments Yang Xu (1): ovl: improve ovl_get_acl() if POSIX ACL support is off --- fs/overlayfs/export.c | 2 +- fs/overlayfs/inode.c | 4 +++- fs/overlayfs/namei.c | 4 ++-- fs/overlayfs/overlayfs.h | 6 ++++++ fs/overlayfs/super.c | 13 +++++++++---- 5 files changed, 21 insertions(+), 8 deletions(-)