projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
49def18
ce1ca7d
)
Merge tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 16 Jan 2017 17:34:37 +0000
(09:34 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 16 Jan 2017 17:34:37 +0000
(09:34 -0800)
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
Trivial merge