projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e73a317 be20aa0)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.