From: Linus Torvalds 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: omap-for-v3.19/fixes-not-urgent-part1~44 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f76628da20f96a179ca62b504886f99ecc29223;p=pandora-kernel.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 Reading git-diff-tree failed