History

Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland: "This set mainly includes a change to the way the dlm uses the SCTP API in the kernel, removing the direct dependency on the sctp module. Other odd SCTP-related fixes are also included. The other notable fix is for a long standing regression in the behavior of lock value blocks for user space locks" * tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: print error from kernel_sendpage dlm: fix lvb copy for user locks dlm: sctp_accept_from_sock() can be static dlm: fix reconnecting but not sending data dlm: replace BUG_ON with a less severe handling dlm: use sctp 1-to-1 API dlm: fix not reconnecting on connecting error handling dlm: fix race while closing connections dlm: fix connection stealing if using SCTP

Linus Torvalds committed 11 years ago

Commit 9cbf22b2 parents ea814ab b3a5bbf3 files · +305 −447Browse files

Showing the changes to include/uapi (1 of 3 files). Show all

Unified · Split

include/uapi/linux/dlm_device.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 /* Version of the device interface */
2727 #define DLM_DEVICE_VERSION_MAJOR 6
2828 #define DLM_DEVICE_VERSION_MINOR 0
29−#define DLM_DEVICE_VERSION_PATCH 1
29+#define DLM_DEVICE_VERSION_PATCH 2
3030
3131 /* struct passed to the lock write */
3232 struct dlm_lock_params {