From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Jun 2016 18:56:28 +0000 (-0700)
Subject: Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v5.15~13457
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2d5ad822322cfb5dd33e90484ed7df4ee6e68ee;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull btrfs fixes from Chris Mason:
 "The important part of this pull is Filipe's set of fixes for btrfs
  device replacement.  Filipe fixed a few issues seen on the list and a
  number he found on his own"

* 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: deal with duplciates during extent_map insertion in btrfs_get_extent
  Btrfs: fix race between device replace and read repair
  Btrfs: fix race between device replace and discard
  Btrfs: fix race between device replace and chunk allocation
  Btrfs: fix race setting block group back to RW mode during device replace
  Btrfs: fix unprotected assignment of the left cursor for device replace
  Btrfs: fix race setting block group readonly during device replace
  Btrfs: fix race between device replace and block group removal
  Btrfs: fix race between readahead and device replace/removal
---

b2d5ad822322cfb5dd33e90484ed7df4ee6e68ee