diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-16 09:34:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-16 09:34:37 -0800 |
| commit | 2eabb8b8d68bc9c7779ba8b04bec8d4f8baed0bc (patch) | |
| tree | 4d8ea8e6ca52f1938269937834641205d8d888f0 /tools/perf/util/cs-etm.h | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| parent | ce1ca7d2d140a1f4aaffd297ac487f246963dd2f (diff) | |
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
Diffstat (limited to 'tools/perf/util/cs-etm.h')