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

[Mark Brown]

Hi all,

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

  fs/nullfs.c

between commit:

  00b04f4495c35 ("Merge tag 'vfs-7.4-rc1.idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs")

from the origin tree and commit:

  69cbe809248be ("nullfs: pass const mnt_idmap to ->setattr()")

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 --combined fs/nullfs.c
index 319c2f5c5a671,f79cc03214dd2..0000000000000
--- a/fs/nullfs.c
+++ b/fs/nullfs.c
@@@ -75,8 -75,7 +75,8 @@@ static ssize_t nullfs_file_splice_write
  }
  
  static int nullfs_file_setattr(const struct mnt_idmap *idmap,
 -			       struct dentry *dentry, struct iattr *attr)
 +			       struct dentry *dentry,
 +			       struct iattr *attr)
  {
  	if (attr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID))
  		return -EPERM;

Attachment: signature.asc
Description: PGP signature