Merge nfs containerization work from Trond's tree
J. Bruce Fields [Wed, 21 Mar 2012 20:42:14 +0000 (16:42 -0400)]
The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.

1  2 
fs/lockd/svc.c
fs/nfsd/nfs4callback.c
fs/nfsd/nfs4state.c
fs/nfsd/nfssvc.c
include/linux/nfs4.h
net/sunrpc/cache.c
net/sunrpc/svcauth_unix.c
net/sunrpc/svcsock.c

diff --cc fs/lockd/svc.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge