Merge remote-tracking branch 'djwong/ocfs2-vfs-reflink-6' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 16 Dec 2016 21:21:05 +0000 (16:21 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 16 Dec 2016 21:21:05 +0000 (16:21 -0500)
commit3c55d6bcfe8163ff2b5636b4aabe3caa3f5d95f4
tree3229c2de6e95352751d1c9e05dcd2925a3212beb
parent4da00fd1b948b408f76488c4e506af748be5fce8
parent29ac8e856cb3694e004037de595dec4ec53d42f2
Merge remote-tracking branch 'djwong/ocfs2-vfs-reflink-6' into for-linus
fs/btrfs/ioctl.c
include/linux/fs.h