Merge branch 'cleanups-post-3.19' of...
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1 Signed-off-by:Chris Mason <clm@fb.com> Conflicts: fs/btrfs/disk-io.c
Showing
- fs/btrfs/async-thread.c 2 additions, 2 deletionsfs/btrfs/async-thread.c
- fs/btrfs/async-thread.h 1 addition, 1 deletionfs/btrfs/async-thread.h
- fs/btrfs/check-integrity.c 1 addition, 4 deletionsfs/btrfs/check-integrity.c
- fs/btrfs/compression.c 1 addition, 1 deletionfs/btrfs/compression.c
- fs/btrfs/compression.h 2 additions, 2 deletionsfs/btrfs/compression.h
- fs/btrfs/ctree.c 28 additions, 25 deletionsfs/btrfs/ctree.c
- fs/btrfs/ctree.h 2 additions, 1 deletionfs/btrfs/ctree.h
- fs/btrfs/delayed-inode.c 5 additions, 4 deletionsfs/btrfs/delayed-inode.c
- fs/btrfs/disk-io.c 301 additions, 253 deletionsfs/btrfs/disk-io.c
- fs/btrfs/disk-io.h 2 additions, 2 deletionsfs/btrfs/disk-io.h
- fs/btrfs/extent-tree.c 5 additions, 5 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.h 1 addition, 1 deletionfs/btrfs/extent_io.h
- fs/btrfs/file-item.c 1 addition, 1 deletionfs/btrfs/file-item.c
- fs/btrfs/file.c 4 additions, 4 deletionsfs/btrfs/file.c
- fs/btrfs/lzo.c 1 addition, 1 deletionfs/btrfs/lzo.c
- fs/btrfs/props.c 2 additions, 0 deletionsfs/btrfs/props.c
- fs/btrfs/qgroup.c 1 addition, 1 deletionfs/btrfs/qgroup.c
- fs/btrfs/raid56.c 3 additions, 10 deletionsfs/btrfs/raid56.c
- fs/btrfs/scrub.c 1 addition, 1 deletionfs/btrfs/scrub.c
- fs/btrfs/sysfs.c 1 addition, 1 deletionfs/btrfs/sysfs.c
Loading
Please register or sign in to comment