From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jun 2020 23:43:16 +0000 (-0700)
Subject: Merge tag 'dlm-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: v5.10.7~2425
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3cea0cad147a9ab4f0e74a2fbdf15d18df1f820;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull dlm updates from David Teigland:
 "This set includes a couple minor cleanups, and dropping the
  interruptible from a wait_event that waits for an event from the
  userspace cluster management"

* tag 'dlm-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: remove BUG() before panic()
  dlm: Switch to using wait_event()
  fs:dlm:remove unneeded semicolon in rcom.c
  dlm: user: Replace zero-length array with flexible-array member
  dlm: dlm_internal: Replace zero-length array with flexible-array member
---

e3cea0cad147a9ab4f0e74a2fbdf15d18df1f820