From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Jan 2017 17:34:37 +0000 (-0800)
Subject: Merge tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.10-rc5~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2eabb8b8d68bc9c7779ba8b04bec8d4f8baed0bc;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull nfsd fixes from Bruce Fields:
 "Miscellaneous nfsd bugfixes, one for a 4.10 regression, three for
  older bugs"

* tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux:
  svcrdma: avoid duplicate dma unmapping during error recovery
  sunrpc: don't call sleeping functions from the notifier block callbacks
  svcrpc: don't leak contexts on PROC_DESTROY
  nfsd: fix supported attributes for acl & labels
---

2eabb8b8d68bc9c7779ba8b04bec8d4f8baed0bc