From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jun 2020 22:52:19 +0000 (-0700)
Subject: Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae03c53d005ef8a1e0253ad67b7b62103ea1fae6;p=linux.git

Merge branch 'work.splice' of git://git./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
---

ae03c53d005ef8a1e0253ad67b7b62103ea1fae6