]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'freespace-tree' into for-linus-4.5
authorChris Mason <clm@fb.com>
Fri, 18 Dec 2015 19:11:10 +0000 (11:11 -0800)
committerChris Mason <clm@fb.com>
Fri, 18 Dec 2015 19:11:10 +0000 (11:11 -0800)
commit9de896bc204291fa8b39e97ec3d77260012a0f0b
tree2ad3d4d98af789fd807795a9683ce4904b3c4182
parent4920d7d57f4b89e6c9ef52a8cf08c2582dcfa7a7
parentfc9b8c6e9fd47b2bbd0d57e888eb7a423d6a4a8d
Merge branch 'freespace-tree' into for-linus-4.5

Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/super.c
fs/btrfs/tests/btrfs-tests.c
fs/btrfs/tests/free-space-tests.c
include/trace/events/btrfs.h