From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jul 2013 17:47:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs... 
X-Git-Tag: firefly_0821_release~176^2~5666
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=90290c4ebe5c64ee34fea0d2cc3025cb934917b8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/josef/btrfs-next

Pull btrfs fixes from Josef Bacik:
 "I'm playing the role of Chris Mason this week while he's on vacation.
  There are a few critical fixes for btrfs here, all regressions and
  have been tested well"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next:
  Btrfs: fix wrong write offset when replacing a device
  Btrfs: re-add root to dead root list if we stop dropping it
  Btrfs: fix lock leak when resuming snapshot deletion
  Btrfs: update drop progress before stopping snapshot dropping
---

90290c4ebe5c64ee34fea0d2cc3025cb934917b8