From: Linus Torvalds Date: Wed, 14 Dec 2016 16:31:37 +0000 (-0800) Subject: Merge tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=19d37ce2a7159ee30bd59d14fe5fe13c932bd5b7;p=linux-beck.git 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 --- 19d37ce2a7159ee30bd59d14fe5fe13c932bd5b7