Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 96aebf3bcd5b..174f5e1e00ab 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4625,6 +4625,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 {
         u64 chunk_offset;
 
+        ASSERT(mutex_is_locked(&extent_root->fs_info->chunk_mutex));
         chunk_offset = find_next_chunk(extent_root->fs_info);
         return __btrfs_alloc_chunk(trans, extent_root, chunk_offset, type);
 }