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)
commit9f76628da20f96a179ca62b504886f99ecc29223
tree0557dab127d1650294565f824466ff6032dbb876
parent6234056e1380e72f316546cba13d0f8f09b29789
parent51904b08072a8bf2b9ed74d1bd7a5300a614471d
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux

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