]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2ee075f 9e960d2)
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)
commit75b086f78eea191fc99fc9589a417009d51b7af6
treeb3852bd4c4a1d040432e42666e8c8825e26d9ceatree | snapshot
parent2ee075f299eb8bf19704bbf3e5a355c5207c5f85commit | diff
parent9e960d2c3b3b2f7ebf5285aaf9e5a387dd783b8ccommit | 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.