From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Oct 2014 20:32:06 +0000 (-0700)
Subject: Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.18-rc3~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f76628da20f96a179ca62b504886f99ecc29223;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

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
---

9f76628da20f96a179ca62b504886f99ecc29223