Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus
This is the kernel portion of btrfs send/receive
Conflicts:
fs/btrfs/Makefile
fs/btrfs/backref.h
fs/btrfs/ctree.c
fs/btrfs/ioctl.c
fs/btrfs/ioctl.h
Signed-off-by: NChris Mason <chris.mason@fusionio.com>
Showing
fs/btrfs/send.c
0 → 100644
此差异已折叠。
fs/btrfs/send.h
0 → 100644
想要评论请 注册 或 登录