From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Mar 2024 22:39:48 +0000 (-0700)
Subject: Merge tag 'dlm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b3603fcb79b1036acae10602bffc4855a4b9af80;p=people%2Faperard%2Flinux.git

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

Pull dlm updates from David Teigland:

 - Fix mistaken variable assignment that caused a refcounting problem

 - Revert a recent change that began using atomic counters where they
   were not needed (for lkb wait_count)

 - Add comments around forced state reset for waiting lock operations
   during recovery

* tag 'dlm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: add comments about forced waiters reset
  dlm: revert atomic_t lkb_wait_count
  dlm: fix user space lkb refcounting
---

b3603fcb79b1036acae10602bffc4855a4b9af80