]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jun 2020 22:52:19 +0000 (15:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jun 2020 22:52:19 +0000 (15:52 -0700)
commitf96c14272ea13d732776362e585cb44ea7105e5a
tree2c3ebbe7a97c6b5e69add4a67723f89df73533f8
parente6adc31716a3ec1ea7f6a279954b6caba95a58d2
parent916dda66f9619b2859d29b06543bd5fcb802b2f2
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull splice updates from Al Viro:
 "Christoph's assorted splice cleanups"

* 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: rename pipe_buf ->steal to ->try_steal
  fs: make the pipe_buf_operations ->confirm operation optional
  fs: make the pipe_buf_operations ->steal operation optional
  trace: remove tracing_pipe_buf_ops
  pipe: merge anon_pipe_buf*_ops
  fs: simplify do_splice_from
  fs: simplify do_splice_to
fs/fuse/dev.c
fs/splice.c
kernel/relay.c
kernel/trace/trace.c