* linux-next: manual merge of the userns tree with the nfsd tree
@ 2013-02-18 5:27 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-02-18 5:27 UTC (permalink / raw)
To: Eric W. Biederman
Cc: linux-next, linux-kernel, Stanislav Kinsbursky, J. Bruce Fields
[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in
net/sunrpc/svcauth_unix.c between commit 2d4383383b0b ("SUNRPC: rework
cache upcall logic") from the nfsd tree and commit 7eaf040b720b ("sunrpc:
Use kuid_t and kgid_t where appropriate") from the userns tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/sunrpc/svcauth_unix.c
index 5085804,a1852e1..0000000
--- 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)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-18 5:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-18 5:27 linux-next: manual merge of the userns tree with the nfsd tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).