From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Feb 2017 22:23:45 +0000 (-0800)
Subject: Merge tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.10-rc8~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fe654dca20892f37226c31bdd2d5b932f8d843a;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux

Pull nfsd revert from Bruce Fields:
 "This patch turned out to have a couple problems. The problems are
  fixable, but at least one of the fixes is a little ugly. The original
  bug has always been there, so we can wait another week or two to get
  this right"

* tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux:
  nfsd: Revert "nfsd: special case truncates some more"
---

7fe654dca20892f37226c31bdd2d5b932f8d843a