summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-01-10 10:17:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2024-01-10 10:17:23 -0800
commitd8c8e595dc31fb639bc4f8a202901afaa15bb13f (patch)
tree0d9bd29e999151aa885b1e76d8d958ca642c137e /arch
parent0c59ae1290741854b6cf597ef05bfa9bc811389f (diff)
parent5beebc1dda47719dac85830c53bca1a0ab497d96 (diff)
Merge tag 'dlm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland: "This set cleans up the interface between nfs lockd and dlm, which is handling nfs file locking for gfs2 and ocfs2. Very basic lockd functionality is fixed, in which the fl owner was using the lockd pid instead of the owner value from nfs" * tag 'dlm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: update format header reflect current format dlm: fix format seq ops type 4 dlm: implement EXPORT_OP_ASYNC_LOCK dlm: use FL_SLEEP to determine blocking vs non-blocking dlm: use fl_owner from lockd dlm: use kernel_connect() and kernel_bind()
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions