summaryrefslogtreecommitdiffstats
path: root/block/scsi_ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-04 14:34:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-04 14:34:06 -0700
commit8a4631144b793590f1b5d2532a7f66df6de29423 (patch)
tree18fb25e26705f4061fdf83eec185cb5957f13c91 /block/scsi_ioctl.c
parent704996566f97e0e24c97052f81678060c213c260 (diff)
parentda3627c30d229fea1e070e984366f80a1c4d9166 (diff)
downloadlinux-8a4631144b793590f1b5d2532a7f66df6de29423.tar.bz2
Merge tag 'dlm-4.18' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions