]> Git Repo - linux.git/commitdiff
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <[email protected]>
Sun, 25 May 2014 17:08:48 +0000 (10:08 -0700)
committerLinus Torvalds <[email protected]>
Sun, 25 May 2014 17:08:48 +0000 (10:08 -0700)
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.


Trivial merge
This page took 0.051705 seconds and 4 git commands to generate.