tree 18d8932af2c04b249f154b1c85ce8893ccc7fea3
parent 484b002e28ca328195829ddc06fa9082c8ad41f8
parent afe3c3fd5392b2f0066930abc5dbd3f4b14a0f13
author Linus Torvalds <torvalds@linux-foundation.org> 1369961336 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1369961336 +0900

Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "A couple minor fixes for the (new to 3.10) gss-proxy code.

  And one regression from user-namespace changes.  (XBMC clients were
  doing something admittedly weird--sending -1 gid's--but something that
  we used to allow.)"

* 'for-3.10' of git://linux-nfs.org/~bfields/linux:
  svcrpc: fix failures to handle -1 uid's and gid's
  svcrpc: implement O_NONBLOCK behavior for use-gss-proxy
  svcauth_gss: fix error code in use_gss_proxy()