Merge remote-tracking branch 'btrfs/next'

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

diff --cc fs/btrfs/delayed-inode.c
Simple merge

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

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

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