]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'vfs-6.19.directory.locking' into base.vfs-6.19.ovl
authorChristian Brauner <brauner@kernel.org>
Wed, 19 Nov 2025 20:56:47 +0000 (21:56 +0100)
committerChristian Brauner <brauner@kernel.org>
Wed, 19 Nov 2025 20:56:47 +0000 (21:56 +0100)
Bring in the directory locking changes as they touch overlayfs in a
pretty substantial way and we are about to change the credential
override semantics quite substantially as well.

Signed-off-by: Christian Brauner <brauner@kernel.org>
1  2 
fs/btrfs/ioctl.c
fs/overlayfs/copy_up.c
fs/smb/server/smb2pdu.c

Simple merge
Simple merge
Simple merge