From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Oct 2014 20:22:00 +0000 (-0700)
Subject: Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.17~15
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a44f867247d58b378dba0059c915a65ca8f93ba5;p=linux.git

Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfix from Bruce Fields:
 "This fixes a data corruption bug introduced by the v3.16 xdr encoding
  rewrite.  I haven't managed to reproduce it myself yet, but it's
  apparently not hard to hit given the right workload"

* 'for-3.17' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix corruption of NFSv4 read data
---

a44f867247d58b378dba0059c915a65ca8f93ba5