Hi all,

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

  fs/tracefs/inode.c

between commit:

  baa23a8d4360 ("tracefs: Reset permissions on remount if permissions are options")

from Linus' tree and commit:

  78ff64081949 ("vfs: Convert tracefs to use the new mount API")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/tracefs/inode.c
index 417c840e6403,abd0b477e287..000000000000
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@@ -362,9 -295,6 +345,8 @@@ static int tracefs_apply_options(struc
  {
  	struct tracefs_fs_info *fsi = sb->s_fs_info;
  	struct inode *inode = d_inode(sb->s_root);
- 	struct tracefs_mount_opts *opts = &fsi->mount_opts;
 +	struct tracefs_inode *ti;
 +	bool update_uid, update_gid;
  	umode_t tmp_mode;
  
  	/*
@@@ -378,31 -308,12 +360,31 @@@
  		WRITE_ONCE(inode->i_mode, tmp_mode);
  	}
  
- 	if (!remount || opts->opts & BIT(Opt_uid))
- 		inode->i_uid = opts->uid;
+ 	if (!remount || fsi->opts & BIT(Opt_uid))
+ 		inode->i_uid = fsi->uid;
  
- 	if (!remount || opts->opts & BIT(Opt_gid))
- 		inode->i_gid = opts->gid;
+ 	if (!remount || fsi->opts & BIT(Opt_gid))
+ 		inode->i_gid = fsi->gid;
  
- 	if (remount && (opts->opts & BIT(Opt_uid) || opts->opts & BIT(Opt_gid))) {
++	if (remount && (fsi->opts & BIT(Opt_uid) || fsi->opts & BIT(Opt_gid))) {
 +
- 		update_uid = opts->opts & BIT(Opt_uid);
- 		update_gid = opts->opts & BIT(Opt_gid);
++		update_uid = fsi->opts & BIT(Opt_uid);
++		update_gid = fsi->opts & BIT(Opt_gid);
 +
 +		rcu_read_lock();
 +		list_for_each_entry_rcu(ti, &tracefs_inodes, list) {
 +			if (update_uid)
 +				ti->flags &= ~TRACEFS_UID_PERM_SET;
 +
 +			if (update_gid)
 +				ti->flags &= ~TRACEFS_GID_PERM_SET;
 +
 +			if (ti->flags & TRACEFS_EVENT_INODE)
 +				eventfs_remount(ti, update_uid, update_gid);
 +		}
 +		rcu_read_unlock();
 +	}
 +
  	return 0;
  }