Merge branch 'for-6.5/splice' into for-6.5/block
authorJens Axboe <axboe@kernel.dk>
Wed, 24 May 2023 14:42:22 +0000 (08:42 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 24 May 2023 14:42:22 +0000 (08:42 -0600)
commitbbeb087e5a6f849e776874cfce1e3c2414b13bb1
tree131fb38b2353fc42f79c41d3fa1ad45efca12ef4
parent5a80bd075f3bce24793ae1aeb06066895ec5aef0
parent9eee8bd81421c5e961cbb1a3c3fa1a06fad545e8
Merge branch 'for-6.5/splice' into for-6.5/block

Merge splice bits as subsequent block cleanups and improvements for DIO
depend on them.

* for-6.5/splice: (31 commits)
  splice: kdoc for filemap_splice_read() and copy_splice_read()
  iov_iter: Kill ITER_PIPE
  splice: Remove generic_file_splice_read()
  splice: Use filemap_splice_read() instead of generic_file_splice_read()
  cifs: Use filemap_splice_read()
  trace: Convert trace/seq to use copy_splice_read()
  zonefs: Provide a splice-read wrapper
  xfs: Provide a splice-read wrapper
  orangefs: Provide a splice-read wrapper
  ocfs2: Provide a splice-read wrapper
  ntfs3: Provide a splice-read wrapper
  nfs: Provide a splice-read wrapper
  f2fs: Provide a splice-read wrapper
  ext4: Provide a splice-read wrapper
  ecryptfs: Provide a splice-read wrapper
  ceph: Provide a splice-read wrapper
  afs: Provide a splice-read wrapper
  9p: Add splice_read wrapper
  net: Make sock_splice_read() use copy_splice_read() by default
  tty, proc, kernfs, random: Use copy_splice_read()
  ...
block/fops.c