]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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

1  2 
fs/fuse/dev.c
fs/splice.c
kernel/relay.c
kernel/trace/trace.c

diff --cc fs/fuse/dev.c
Simple merge
diff --cc fs/splice.c
Simple merge
diff --cc kernel/relay.c
Simple merge
Simple merge