Merge branch 'fix/waitqueue-barriers' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

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

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

diff --cc fs/btrfs/tree-log.c
Simple merge

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