From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Apr 2017 17:43:37 +0000 (-0700)
Subject: Merge tag 'nfsd-4.11-1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.11-rc5~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09c8b3d1d6433860e9c51f5fc72f22a9b56ebb52;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull nfsd fixes from Bruce Fields:
 "The restriction of NFSv4 to TCP went overboard and also broke the
  backchannel; fix.

  Also some minor refinements to the nfsd version-setting interface that
  we'd like to get fixed before release"

* tag 'nfsd-4.11-1' of git://linux-nfs.org/~bfields/linux:
  svcrdma: set XPT_CONG_CTRL flag for bc xprt
  NFSD: fix nfsd_reset_versions for NFSv4.
  NFSD: fix nfsd_minorversion(.., NFSD_AVAIL)
  NFSD: further refinement of content of /proc/fs/nfsd/versions
  nfsd: map the ENOKEY to nfserr_perm for avoiding warning
  SUNRPC/backchanel: set XPT_CONG_CTRL flag for bc xprt
---

09c8b3d1d6433860e9c51f5fc72f22a9b56ebb52