]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ae2fdc 6e3d620)
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 May 2014 17:08:48 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 May 2014 17:08:48 +0000 (10:08 -0700)
commit848a4f47da056174b9b0710c4e9d742851b785a9
treee66ae4c98b1c4b09df1bed1c91661d8017c3f9e5tree | snapshot
parent3ae2fdc225c757fdb5436d3e5e804f57ba366d56commit | diff
parent6e3d6205a8c7d43c062f2bc12d80cf73326d8859commit | diff
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux

Pull two nfsd bugfixes from Bruce Fields:
 "Just two bugfixes, one for a merge-window-introduced ACL regression,
  the other for a longer-standing v4 state bug"

* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
  nfsd4: warn on finding lockowner without stateid's
  nfsd4: remove lockowner when removing lock stateid
  nfsd4: fix corruption on setting an ACL.
Linux Kernel Source Tree.