]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'work.fdtable' into vfs.file
authorChristian Brauner <brauner@kernel.org>
Thu, 10 Oct 2024 10:00:03 +0000 (12:00 +0200)
committerChristian Brauner <brauner@kernel.org>
Wed, 30 Oct 2024 08:58:02 +0000 (09:58 +0100)
Bring in the fdtable changes for this cycle.

Signed-off-by: Christian Brauner <brauner@kernel.org>
1  2 
fs/file.c
fs/file_table.c

diff --cc fs/file.c
Simple merge
diff --cc fs/file_table.c
Simple merge