Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs into...

diff --cc fs/btrfs/ctree.c
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/dev-replace.c
Simple merge

diff --cc fs/btrfs/scrub.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge

diff --cc fs/btrfs/volumes.h
Simple merge