tree 6e88bae48c06f5b4a099989abb04178b939d2b24
parent 516f7b3f2a7dbe93d3075e76a06bbfcd0c0ee4f7
parent d4a516560fc96a9d486a9939bcb567e3fdce8f49
author Linus Torvalds <torvalds@linux-foundation.org> 1378868699 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1378868699 -0700

Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

Pull nfsd updates from Bruce Fields:
 "This was a very quiet cycle! Just a few bugfixes and some cleanup"

* 'nfsd-next' of git://linux-nfs.org/~bfields/linux:
  rpc: let xdr layer allocate gssproxy receieve pages
  rpc: fix huge kmalloc's in gss-proxy
  rpc: comment on linux_cred encoding, treat all as unsigned
  rpc: clean up decoding of gssproxy linux creds
  svcrpc: remove unused rq_resused
  nfsd4: nfsd4_create_clid_dir prints uninitialized data
  nfsd4: fix leak of inode reference on delegation failure
  Revert "nfsd: nfs4_file_get_access: need to be more careful with O_RDWR"
  sunrpc: prepare NFS for 2038
  nfsd4: fix setlease error return
  nfsd: nfs4_file_get_access: need to be more careful with O_RDWR