diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-05 16:43:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-05 16:43:16 -0700 |
| commit | e3cea0cad147a9ab4f0e74a2fbdf15d18df1f820 (patch) | |
| tree | e373731c062fcf7868c4af1c42a128a6cbcd6cd7 /fs/orangefs | |
| parent | 3803d5e4d3ce2600ffddc16a1999798bc719042d (diff) | |
| parent | fe204591cc9480347af7d2d6029b24a62e449486 (diff) | |
Merge tag 'dlm-5.8' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs/orangefs')
0 files changed, 0 insertions, 0 deletions