From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Sep 2015 19:57:48 +0000 (-0700)
Subject: Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: firefly_0821_release~176^2~1155
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9cbf22b37ae0592dea809cb8d424990774c21786;p=firefly-linux-kernel-4.4.55.git

Merge tag 'dlm-4.3' of git://git./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
---

9cbf22b37ae0592dea809cb8d424990774c21786