| commit | b914c5b2130239fd378d1a719ab3c53f0c782be9 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 26 Nov 2014 03:05:41 +0000 (25 19:05 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 26 Nov 2014 03:05:41 +0000 (25 19:05 -0800) | ||
| tree | b3852bd4c4a1d040432e42666e8c8825e26d9cea | treesnapshot (tar.gz zip) |
| parent | 277f850fbc4a0c732311af2b9a2d28d29a3c5582 | commitdiff |
| parent | c6c15e1ed303ffc47e696ea1c9a9df1761c1f603 | commitdiff |
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"These fix one mishandling of the case when security labels are
configured out, and two races in the 4.1 backchannel code"
* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix slot wake up race in the nfsv4.1 callback code
SUNRPC: Fix locking around callback channel reply receive
nfsd: correctly define v4.2 support attributes
Pull nfsd bugfixes from Bruce Fields:
"These fix one mishandling of the case when security labels are
configured out, and two races in the 4.1 backchannel code"
* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix slot wake up race in the nfsv4.1 callback code
SUNRPC: Fix locking around callback channel reply receive
nfsd: correctly define v4.2 support attributes