]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d24f7e f4c1ee9)
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jun 2014 00:20:38 +0000 (14:20 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jun 2014 00:20:38 +0000 (14:20 -1000)
commitc5464fd62d9c27b471e7ffbff04a5c6ef3c0f4d1
tree7349fe8111e2ba8ee7a9aba69ec8893a69d8a573tree | snapshot
parent2d24f7e3be6e161a5fdebf39a65606f911a42165commit | diff
parentf4c1ee96e5195b3199b9bc9792f764abd34c7cf7commit | diff
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Fixes for a new regression from the xdr encoding rewrite, and a
  delegation problem we've had for a while (made somewhat more annoying
  by the vfs delegation support added in 3.13)"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  NFSD: fix bug for readdir of pseudofs
  NFSD: Don't hand out delegations for 30 seconds after recalling them.
Linux Kernel Source Tree.