From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 05:27:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'userns/for-next'
X-Git-Tag: next-20130220~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0099596141b0011d728236b7b8249caf0ca3bcb5;p=karo-tx-linux.git

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

Conflicts:
	net/sunrpc/svcauth_unix.c
---

0099596141b0011d728236b7b8249caf0ca3bcb5
diff --cc net/sunrpc/svcauth_unix.c
index 5085804ec8a7,a1852e19ed0c..c3f9e1ef7f53
--- a/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)