]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
projects / thirdparty / kernel / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0d15cc b2781e1)
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jul 2013 20:43:55 +0000 (13:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jul 2013 20:43:55 +0000 (13:43 -0700)
Pull nfsd bugfixes from Bruce Fields:
 "Just three minor bugfixes"

* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
  svcrdma: underflow issue in decode_write_list()
  nfsd4: fix minorversion support interface
  lockd: protect nlm_blocked access in nlmsvc_retry_blocked

1  2 
fs/lockd/svclock.c patch | diff1 | diff2 | blob | history

diff --cc fs/lockd/svclock.c
Simple merge
A mirror of Linus' kernel repository