]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27ad327 834e576)
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Nov 2014 03:05:41 +0000 (19:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Nov 2014 03:05:41 +0000 (19:05 -0800)
commit9c5f52ca6e85b026c8aa1e69f0cc6a09b7c8c8fa
treeb3852bd4c4a1d040432e42666e8c8825e26d9ceatree | snapshot
parent27ad3271dea0c5db02aabf9df0b2179ef1af641ccommit | diff
parent834e576e13bf813346102efca699bbdde08f0e30commit | diff
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
Linux Kernel Source Tree.