]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Nov 2016 01:21:13 +0000 (17:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Nov 2016 01:21:13 +0000 (17:21 -0800)
Pull vfs splice fix from Al Viro.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix default_file_splice_read()


Trivial merge