projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7049965 da3627c)
Merge tag 'dlm-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2018 21:34:06 +0000 (14:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2018 21:34:06 +0000 (14:34 -0700)
commit8a4631144b793590f1b5d2532a7f66df6de29423
tree18fb25e26705f4061fdf83eec185cb5957f13c91tree | snapshot
parent704996566f97e0e24c97052f81678060c213c260commit | diff
parentda3627c30d229fea1e070e984366f80a1c4d9166commit | diff
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
https://github.com/torvalds/linux.git