aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:51:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:51:58 -0700
commit40689ac479e6477096b3dbd5a374cfe3970da3a3 (patch)
treecd3fb04fe7f6281fd492c171b1e880d68d757cff /arch/m68k/kernel
parentcc150a2861e744d8f574d571762cc7e9f928abb3 (diff)
parent2b75bc9121e54e22537207b47b71373bcb0be41c (diff)
Merge tag 'dlm-3.7' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/m68k/kernel')
0 files changed, 0 insertions, 0 deletions