From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Dec 2015 23:52:32 +0000 (-0800)
Subject: Merge tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.4-rc7~14
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=0bee6ec80b92d853d6cad3c35fb5f1dd2d88b8f8;p=sfrench%2Fcifs-2.6.git

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

Pull nfsd fix from Bruce Fields:
 "Just one fix for a NFSv4 callback bug introduced in 4.4"

* tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux:
  nfsd: don't hold ls_mutex across a layout recall
---

0bee6ec80b92d853d6cad3c35fb5f1dd2d88b8f8