linux-next: manual merge of the vfs-brauner tree with the ksmbd tree

[Mark Brown]

Hi all,

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

  fs/smb/server/vfs.h

between commits:

  8c329cbedbe15 ("ksmbd: use the existing xattr name for a named stream")
  9a4c5d1700381 ("ksmbd: look up stream size by exact xattr name")
  26a14db500b82 ("ksmbd: copy stream content when renaming to a new stream name")

from the ksmbd tree and commit:

  16d90b57d8439 ("fs: port xattr to const mnt_idmap")

from the vfs-brauner tree.

I fixed it up (see below) 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.

diff --cc fs/smb/server/vfs.h
index dedb103316573,67cc48e583c81..0000000000000
--- a/fs/smb/server/vfs.h
+++ b/fs/smb/server/vfs.h
@@@ -109,15 -108,10 +109,15 @@@ ssize_t ksmbd_vfs_getxattr(const struc
  			   struct dentry *dentry,
  			   char *xattr_name,
  			   char **xattr_buf);
- ssize_t ksmbd_vfs_xattr_len(struct mnt_idmap *idmap,
++ssize_t ksmbd_vfs_xattr_len(const struct mnt_idmap *idmap,
 +			    struct dentry *dentry, char *xattr_name);
- ssize_t ksmbd_vfs_getcasexattr(struct mnt_idmap *idmap,
++ssize_t ksmbd_vfs_getcasexattr(const struct mnt_idmap *idmap,
 +			       struct dentry *dentry, char *attr_name,
 +			       int attr_name_len, char **attr_value);
- ssize_t ksmbd_vfs_casexattr_len(struct mnt_idmap *idmap,
+ ssize_t ksmbd_vfs_casexattr_len(const struct mnt_idmap *idmap,
  				struct dentry *dentry, char *attr_name,
 -				int attr_name_len);
 +				int attr_name_len, char *actual_name);
- int ksmbd_vfs_setxattr(struct mnt_idmap *idmap,
+ int ksmbd_vfs_setxattr(const struct mnt_idmap *idmap,
  		       const struct path *path, const char *attr_name,
  		       void *attr_value, size_t attr_size, int flags,
  		       bool get_write);