diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-31 04:48:56 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-31 04:48:56 +0400 |
| commit | 4203afc3fb0c5dd4ced24ee116f31ec591f7c5c7 (patch) | |
| tree | 18d8932af2c04b249f154b1c85ce8893ccc7fea3 /net/ipv4/tcp_scalable.c | |
| parent | 484b002e28ca328195829ddc06fa9082c8ad41f8 (diff) | |
| parent | afe3c3fd5392b2f0066930abc5dbd3f4b14a0f13 (diff) | |
| download | linux-4203afc3fb0c5dd4ced24ee116f31ec591f7c5c7.tar.xz | |
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()
Diffstat (limited to 'net/ipv4/tcp_scalable.c')
0 files changed, 0 insertions, 0 deletions