From: Linus Torvalds Date: Mon, 1 Oct 2012 20:51:58 +0000 (-0700) Subject: Merge tag 'dlm-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm X-Git-Tag: firefly_0821_release~3680^2~1973 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=40689ac479e6477096b3dbd5a374cfe3970da3a3;p=firefly-linux-kernel-4.4.55.git Merge tag 'dlm-3.7' of git://git./linux/kernel/git/teigland/linux-dlm Pull dlm updates from David Teigland: "There are two main patches in this set, both related to the userland dlm_controld daemon. The first fixes a deadlock between dlm_controld and the dlm_send workqueue when both access configfs data simultaneously. The second reworks some code to get around a long standing, but intentional, unlock balance warning. The userland daemon no longer takes a lock that is later released from the kernel. The other commits are minor fixes and changes." * tag 'dlm-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: check the maximum size of a request from user dlm: cleanup send_to_sock routine dlm: convert add_sock routine return value type to void dlm: remove redundant variable assignments dlm: fix unlock balance warnings dlm: fix uninitialized spinlock dlm: fix deadlock between dlm_send and dlm_controld --- 40689ac479e6477096b3dbd5a374cfe3970da3a3