projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6234056 51904b0)
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Oct 2014 20:32:06 +0000 (13:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Oct 2014 20:32:06 +0000 (13:32 -0700)
Pull two nfsd fixes from Bruce Fields:
 "One regression from the 3.16 xdr rewrite, one an older bug exposed by
  a separate bug in the client's new SEEK code"

* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix crash on unknown operation number
  nfsd4: fix response size estimation for OP_SEQUENCE


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.