tree e66ae4c98b1c4b09df1bed1c91661d8017c3f9e5
parent 037430078fbbb956a9bd6ada00f528e9d1e4c92c
parent 27b11428b7de097c42f205beabb1764f4365443b
author Linus Torvalds <torvalds@linux-foundation.org> 1401037728 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1401037728 -0700

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.