From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Nov 2015 23:45:45 +0000 (-0800)
Subject: Merge branch 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v5.15~14633
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80e0c505b22e64ab1787285b182a1e8395e53991;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus-4.4' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "This has Mark Fasheh's patches to fix quota accounting during subvol
  deletion, which we've been working on for a while now.  The patch is
  pretty small but it's a key fix.

  Otherwise it's a random assortment"

* 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix balance range usage filters in 4.4-rc
  btrfs: qgroup: account shared subtree during snapshot delete
  Btrfs: use btrfs_get_fs_root in resolve_indirect_ref
  btrfs: qgroup: fix quota disable during rescan
  Btrfs: fix race between cleaner kthread and space cache writeout
  Btrfs: fix scrub preventing unused block groups from being deleted
  Btrfs: fix race between scrub and block group deletion
  btrfs: fix rcu warning during device replace
  btrfs: Continue replace when set_block_ro failed
  btrfs: fix clashing number of the enhanced balance usage filter
  Btrfs: fix the number of transaction units needed to remove a block group
  Btrfs: use global reserve when deleting unused block group after ENOSPC
  Btrfs: tests: checking for NULL instead of IS_ERR()
  btrfs: fix signed overflows in btrfs_sync_file
---

80e0c505b22e64ab1787285b182a1e8395e53991