summaryrefslogtreecommitdiffstats
path: root/v6.5/966b7bd3ca3eb6f0b1b175947ba75ffeecad8f4d
diff options
context:
space:
mode:
Diffstat (limited to 'v6.5/966b7bd3ca3eb6f0b1b175947ba75ffeecad8f4d')
-rw-r--r--v6.5/966b7bd3ca3eb6f0b1b175947ba75ffeecad8f4d5
1 files changed, 5 insertions, 0 deletions
diff --git a/v6.5/966b7bd3ca3eb6f0b1b175947ba75ffeecad8f4d b/v6.5/966b7bd3ca3eb6f0b1b175947ba75ffeecad8f4d
new file mode 100644
index 00000000000..139650d0a38
--- /dev/null
+++ b/v6.5/966b7bd3ca3eb6f0b1b175947ba75ffeecad8f4d
@@ -0,0 +1,5 @@
+966b7bd3ca3e ("dlm: adapt to breakup of struct file_lock")
+11ff73082f17 ("dlm: convert to using new filelock helpers")
+6bd4a2bfe568 ("dlm: use FL_SLEEP to determine blocking vs non-blocking")
+dbee1adeb7e6 ("dlm: use fl_owner from lockd")
+dc52cd2eff4a ("fs: dlm: fix F_CANCELLK to cancel pending request")