From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jul 2013 16:52:07 +0000 (-0700)
Subject: Merge tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6072a93b98e660211c4b46a8381833425bdcf7b7;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'dlm-3.11' of git://git./linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "This set includes a number of SCTP related fixes in the dlm, and a few
  other minor fixes and changes."

* tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: Avoid LVB truncation
  dlm: log an error for unmanaged lockspaces
  dlm: config: using strlcpy instead of strncpy
  dlm: remove duplicated include from lowcomms.c
  dlm: disable nagle for SCTP
  dlm: retry failed SCTP sends
  dlm: try other IPs when sctp init assoc fails
  dlm: clear correct bit during sctp init failure handling
  dlm: set sctp assoc id during setup
  dlm: clear correct init bit during sctp setup
---

6072a93b98e660211c4b46a8381833425bdcf7b7