]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge patch series "filelock: fix conflict detection with userland file delegations"
authorChristian Brauner <brauner@kernel.org>
Mon, 15 Dec 2025 14:20:38 +0000 (15:20 +0100)
committerChristian Brauner <brauner@kernel.org>
Mon, 15 Dec 2025 14:20:38 +0000 (15:20 +0100)
Jeff Layton <jlayton@kernel.org> says:

This patchset fixes the way that conflicts are detected when userland
requests file delegations. The problem is due to a hack that was added
long ago which worked up until userland could request a file delegation.

This fixes the bug and makes things a bit less hacky. Please consider
for v6.19.

* patches from https://patch.msgid.link/20251204-dir-deleg-ro-v2-0-22d37f92ce2c@kernel.org:
  filelock: allow lease_managers to dictate what qualifies as a conflict
  filelock: add lease_dispose_list() helper

Link: https://patch.msgid.link/20251204-dir-deleg-ro-v2-0-22d37f92ce2c@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

Trivial merge