Merge tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2015 23:52:32 +0000 (15:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2015 23:52:32 +0000 (15:52 -0800)
commit0bee6ec80b92d853d6cad3c35fb5f1dd2d88b8f8
treea005ee8206661536d15ed1ebd21edafae5521541
parente73a31778a98cfbfd433911491d11a2f68fad073
parentbe20aa00c67102aaa54599518c086a2338b19f4c
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