]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ac7da5 d533e7c)
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)
commita2e7564cfdd3d62cd1a9e2bfe6bfd56339c11e56
tree59e1cbab628f69afddd80e1eecaa18b2c6a02b92tree | snapshot
parent3ac7da51c3668bb45a2d18403d2d213a75db0715commit | diff
parentd533e7cc488a9911551f485878cd8bedfae2ef7ccommit | diff
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.