From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Jun 2017 23:24:48 +0000 (-0700)
Subject: Merge tag 'nfsd-4.12-1' of git://linux-nfs.org/~bfields/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3b1e342be265f7df915c68c7c6e450956d8865aa;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'nfsd-4.12-1' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Revert patch accidentally included in the merge window pull request,
  and fix a crash that was likely a result of buggy client behavior"

* tag 'nfsd-4.12-1' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix null dereference on replay
  nfsd: Revert "nfsd: check for oversized NFSv2/v3 arguments"
---

3b1e342be265f7df915c68c7c6e450956d8865aa