Hi Linus, Please pull dlm updates from tag:
git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-3.12 This set includes a workqueue cleanup and the removal of incorrect and unneeded signal blocking. The removal of signal blocking conflicts with Oleg's 201d3df dlm: kill the unnecessary and wrong device_close()->recalc_sigpending() Let me know if you'd like me to send a resolved patch. Thanks, Dave David Teigland (1): dlm: remove signal blocking Tejun Heo (1): dlm: WQ_NON_REENTRANT is meaningless and going away fs/dlm/ast.c | 5 +---- fs/dlm/user.c | 25 ++++++------------------- 2 files changed, 7 insertions(+), 23 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/