From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jun 2018 21:34:06 +0000 (-0700)
Subject: Merge tag 'dlm-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8a4631144b793590f1b5d2532a7f66df6de29423;p=openwrt%2Fstaging%2Fblogic.git

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

Pull dlm updates from David Teigland:
 "These three commits fix and clean up the flags dlm was using on its
  SCTP sockets. This improves performance and fixes some bad connection
  delays"

* tag 'dlm-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: remove O_NONBLOCK flag in sctp_connect_to_sock
  dlm: make sctp_connect_to_sock() return in specified time
  dlm: fix a clerical error when set SCTP_NODELAY
---

8a4631144b793590f1b5d2532a7f66df6de29423