]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'vfs.file' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs...
authorJens Axboe <axboe@kernel.dk>
Tue, 12 Dec 2023 14:42:24 +0000 (07:42 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 12 Dec 2023 14:42:24 +0000 (07:42 -0700)
commit2394b311c6b5bab225e5307c819eb1ea59de49de
treecae55cbcff25341023c3d93952610935bd0fa3ff
parenta39b6ac3781d46ba18193c9dbb2110f31e9bffe9
parent4e94ddfe2aab72139acb8d5372fac9e6c3f3e383
Merge branch 'vfs.file' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs into for-6.8/io_uring

Merge vfs.file from the VFS tree to avoid conflicts with receive_fd() now
having 3 arguments rather than just 2.

* 'vfs.file' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  file: remove __receive_fd()
  file: stop exposing receive_fd_user()
  fs: replace f_rcuhead with f_task_work
  file: remove pointless wrapper
  file: s/close_fd_get_file()/file_close_fd()/g
  Improve __fget_files_rcu() code generation (and thus __fget_light())
  file: massage cleanup of files that failed to open
net/core/scm.c