From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 May 2015 18:14:10 +0000 (-0700)
Subject: Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7ce14f6ff26460819345fe8495cf2dd6538b7cdc;p=openwrt%2Fstaging%2Fblogic.git

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

Pull btrfs fixes from Chris Mason:
 "I fixed up a regression from 4.0 where conversion between different
  raid levels would sometimes bail out without converting.

  Filipe tracked down a race where it was possible to double allocate
  chunks on the drive.

  Mark has a fix for fiemap.  All three will get bundled off for stable
  as well"

* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix regression in raid level conversion
  Btrfs: fix racy system chunk allocation when setting block group ro
  btrfs: clear 'ret' in btrfs_check_shared() loop
---

7ce14f6ff26460819345fe8495cf2dd6538b7cdc