From: Christian Brauner Date: Mon, 15 Dec 2025 14:20:38 +0000 (+0100) Subject: Merge patch series "filelock: fix conflict detection with userland file delegations" X-Git-Tag: v6.19-rc5~25^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24835a96f21ebb295d24e265b5466d9e40f12cbd;p=thirdparty%2Fkernel%2Flinux.git Merge patch series "filelock: fix conflict detection with userland file delegations" Jeff Layton 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 --- 24835a96f21ebb295d24e265b5466d9e40f12cbd