diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 08:31:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 08:31:37 -0800 |
| commit | 19d37ce2a7159ee30bd59d14fe5fe13c932bd5b7 (patch) | |
| tree | fe92aedc62b5283b2473cd1506ef760285d94f7a /include/trace | |
| parent | Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy (diff) | |
| parent | dlm: fix error return code in sctp_accept_from_sock() (diff) | |
| download | linux-dev-19d37ce2a7159ee30bd59d14fe5fe13c932bd5b7.tar.xz linux-dev-19d37ce2a7159ee30bd59d14fe5fe13c932bd5b7.zip | |
Merge tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm fixes from David Teigland:
"This set fixes error reporting for dlm sockets, removes the unbound
property on the dlm callback workqueue to improve performance, and
includes a couple trivial changes"
* tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: fix error return code in sctp_accept_from_sock()
dlm: don't specify WQ_UNBOUND for the ast callback workqueue
dlm: remove lock_sock to avoid scheduling while atomic
dlm: don't save callbacks after accept
dlm: audit and remove any unnecessary uses of module.h
dlm: make genl_ops const
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions