git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 0374300)
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)
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.

fs/nfsd/nfs4acl.c patch | blob | history
fs/nfsd/nfs4state.c patch | blob | history

diff --cc fs/nfsd/nfs4acl.c
Simple merge
diff --cc fs/nfsd/nfs4state.c
Simple merge
Pandora Kernel Repository