Merge branch 'btrfs-3.0' into for-linus