Merge remote-tracking branch 'nfsd/nfsd-next'

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

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

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

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

diff --cc net/sunrpc/xprtrdma/transport.c
Simple merge

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