From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 May 2013 00:48:56 +0000 (+0900)
Subject: Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.0~3967
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4203afc3fb0c5dd4ced24ee116f31ec591f7c5c7;p=platform%2Fkernel%2Flinux-amlogic.git

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()
---

4203afc3fb0c5dd4ced24ee116f31ec591f7c5c7