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)
1  2 
fs/btrfs/ioctl.c
include/linux/fs.h

Simple merge
Simple merge