projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b13475 13c0f52)
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 May 2017 18:38:06 +0000 (11:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 May 2017 18:38:06 +0000 (11:38 -0700)
commitda7b66ffb2815800440d9e1649282a27c805304f
tree59e1cbab628f69afddd80e1eecaa18b2c6a02b92tree | snapshot
parent5b13475a5e12c49c24422ba1bd9998521dec1d4ecommit | diff
parent13c0f52beb6310b9c08804c0929901f70abd211acommit | diff
Merge branch 'work.splice' of git://git./linux/kernel/git/viro/vfs

Pull splice updates from Al Viro:
 "These actually missed the last cycle; the branch itself is from last
  December"

* 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  make nr_pages calculation in default_file_splice_read() a bit less ugly
  splice/tee/vmsplice: validate flags
  splice_pipe_desc: kill ->flags
  remove spd_release_page()
fs/splice.c diff1 | diff2 | blob | history
kernel/relay.c diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
Domain: System / Kernel;