]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0f965a8a0802da5b94e81a7c1a77c72048122ded
treee66ae4c98b1c4b09df1bed1c91661d8017c3f9e5
parent3aa305761df1f250aa6dceb24c11fee62a67d14c
parent96129e4eed3771bdaaced6e06e4c7b493e50b4f3
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.