From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Jul 2014 22:10:04 +0000 (-0700)
Subject: Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: firefly_0821_release~176^2~3636
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bae78dc25993f62194ee53da67b14e3d5007c6c4;p=firefly-linux-kernel-4.4.55.git

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

Pull nfsd bugfix from Bruce Fields:
 "Another xdr encoding regression that may cause incorrect encoding on
  failures of certain readdirs"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix bad reserving space for encoding rdattr_error
---

bae78dc25993f62194ee53da67b14e3d5007c6c4