Merge remote-tracking branch 'userns/for-next'

Conflicts:
	net/sunrpc/svcauth_unix.c

diff --cc fs/9p/vfs_inode.c
Simple merge

diff --cc fs/9p/vfs_inode_dotl.c
Simple merge

diff --cc fs/ceph/caps.c
Simple merge

diff --cc fs/ceph/mds_client.c
Simple merge

diff --cc fs/ceph/mds_client.h
Simple merge

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/cifs/cifsglob.h
Simple merge

diff --cc fs/cifs/cifssmb.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/cifs/file.c
Simple merge

diff --cc fs/gfs2/bmap.c
Simple merge

diff --cc fs/gfs2/dir.c
Simple merge

diff --cc fs/gfs2/incore.h
Simple merge

diff --cc fs/gfs2/inode.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

diff --cc fs/gfs2/super.c
Simple merge

diff --cc fs/gfs2/sys.c
Simple merge

diff --cc fs/gfs2/xattr.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfsd/export.c
Simple merge

diff --cc fs/nfsd/nfs4idmap.c
Simple merge

diff --cc fs/nfsd/nfs4recover.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/nfs4xdr.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/sunrpc/auth_gss/auth_gss.c
Simple merge

diff --cc net/sunrpc/auth_gss/svcauth_gss.c
Simple merge

diff --cc net/sunrpc/svcauth_unix.c
index 5085804ec8a7360952d25c19e231eef4fca78df3,a1852e19ed0ced5297189dc5b5171217cc4c33e9..c3f9e1ef7f531857f432993896d13d0ae8442876
--- 1/net/sunrpc/svcauth_unix.c
--- 2/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@@ -465,7 -475,12 +470,7 @@@ static void unix_gid_request(struct cac
        (*bpp)[-1] = '\n';
  }
  
- static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, uid_t uid);
 -static int unix_gid_upcall(struct cache_detail *cd, struct cache_head *h)
 -{
 -      return sunrpc_cache_pipe_upcall(cd, h, unix_gid_request);
 -}
 -
+ static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
  
  static int unix_gid_parse(struct cache_detail *cd,
                        char *mesg, int mlen)