linux-next: manual merge of the btrfs tree with the vfs-idmapping tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the btrfs tree got a conflict in:

  fs/btrfs/ctree.h

between commit:

  138060ba92b3 ("fs: pass dentry to set acl method")

from the vfs-idmapping tree and commit:

  6ef78f46e652 ("btrfs: move acl prototypes into acl.h")

from the btrfs tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 28 Oct 2022 09:44:23 +1100
Subject: [PATCH] btrfs: for up for "fs: pass dentry to set acl method"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 fs/btrfs/acl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/acl.h b/fs/btrfs/acl.h
index 45197b4f73bf..39bd36e6eeb7 100644
--- a/fs/btrfs/acl.h
+++ b/fs/btrfs/acl.h
@@ -6,7 +6,7 @@
 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
 
 struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu);
-int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
+int btrfs_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,
 		  struct posix_acl *acl, int type);
 int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode,
 		    struct posix_acl *acl, int type);
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpuJuynoHh7k.pgp
Description: OpenPGP digital signature