linux-next: manual merge of the vfs tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  fs/proc/base.c

between commit:

  68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user namespaces")

from Linus' tree and commit:

  caffc373c573 ("statx: Add a system call to make enhanced file info available")

from the vfs 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/proc/base.c
index b8f06273353e,b5a5d3cab358..000000000000
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -1724,11 -1711,13 +1724,12 @@@ out_unlock
  	return NULL;
  }
  
- int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+ int pid_getattr(const struct path *path, struct kstat *stat,
+ 		u32 request_mask, unsigned int query_flags)
  {
- 	struct inode *inode = d_inode(dentry);
+ 	struct inode *inode = d_inode(path->dentry);
  	struct task_struct *task;
- 	struct pid_namespace *pid = dentry->d_sb->s_fs_info;
 -	const struct cred *cred;
+ 	struct pid_namespace *pid = path->dentry->d_sb->s_fs_info;
  
  	generic_fillattr(inode, stat);