summaryrefslogtreecommitdiffstats
path: root/fs/splice.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-03-18 21:07:38 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2016-03-18 21:07:38 +0100
commit8b23a8ce1094f25a85826e25217c5b9779a4f5aa (patch)
tree09a59f171c61b9d1c8c22c1791aa07dd35a7eb75 /fs/splice.c
parentjffs2: reduce the breakage on recovery from halfway failed rename() (diff)
parentdcache.c: new helper: __d_add() (diff)
parentsplice: handle zero nr_pages in splice_to_pipe() (diff)
parentblk-mq: enable polling support by default (diff)
downloadlinux-8b23a8ce1094f25a85826e25217c5b9779a4f5aa.tar.xz
linux-8b23a8ce1094f25a85826e25217c5b9779a4f5aa.zip
Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next