projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd1cfc4 31db9f7)
Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus
authorChris Mason <chris.mason@fusionio.com>
Wed, 25 Jul 2012 23:17:39 +0000 (19:17 -0400)
committerChris Mason <chris.mason@fusionio.com>
Wed, 25 Jul 2012 23:19:10 +0000 (19:19 -0400)
commit113c1cb530e10bcada93d88ffaa6b521aae2d251
treee41776281314eb8fdc6b07e1533491e5f9ec21aftree | snapshot (tar.gz zip)
parentcd1cfc49153ba2bef247e500d8bd4d135193ece9commit | diff
parent31db9f7c23fbf7e95026143f79645de6507b583bcommit | diff
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: Chris Mason <chris.mason@fusionio.com>
fs/btrfs/Makefile diff1 | diff2 | blob | history
fs/btrfs/backref.c diff1 | diff2 | blob | history
fs/btrfs/backref.h diff1 | diff2 | blob | history
fs/btrfs/ctree.c diff1 | diff2 | blob | history
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.h diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history