From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 May 2015 22:50:58 +0000 (-0700)
Subject: Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: firefly_0821_release~176^2~1767
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c7309e88a694acbe9e42655f02b9dd37c7931424;p=firefly-linux-kernel-4.4.55.git

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

Pull btrfs fixes from Chris Mason:
 "The first commit is a fix from Filipe for a very old extent buffer
  reuse race that triggered a BUG_ON.  It hasn't come up often, I looked
  through old logs at FB and we hit it a handful of times over the last
  year.

  The rest are other corners he hit during testing"

* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix race when reusing stale extent buffers that leads to BUG_ON
  Btrfs: fix race between block group creation and their cache writeout
  Btrfs: fix panic when starting bg cache writeout after IO error
  Btrfs: fix crash after inode cache writeback failure
---

c7309e88a694acbe9e42655f02b9dd37c7931424