From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 May 2025 19:40:39 +0000 (-0700)
Subject: Merge tag 'dlm-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: v6.16-rc1~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1fd8bd0cc18cd8572ac0da21418cce2ee45e04f;p=thirdparty%2Flinux.git

Merge tag 'dlm-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "This fixes delays when shutting down SCTP connections, and updates dlm
  Kconfig for SCTP"

* tag 'dlm-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: drop SCTP Kconfig dependency
  dlm: reject SCTP configuration if not enabled
  dlm: use SHUT_RDWR for SCTP shutdown
  dlm: mask sk_shutdown value
---

b1fd8bd0cc18cd8572ac0da21418cce2ee45e04f