Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757785AbbEWBOi (ORCPT ); Fri, 22 May 2015 21:14:38 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:38240 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756562AbbEWBOg (ORCPT ); Fri, 22 May 2015 21:14:36 -0400 Date: Fri, 22 May 2015 21:14:30 -0400 From: Chris Mason To: , linux-btrfs , LKML Subject: [GIT PULL] Btrfs Message-ID: <20150523000905.GA16230@ret.masoncoding.com> Mail-Followup-To: Chris Mason , torvalds@linux-foundation.org, linux-btrfs , LKML MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [192.168.54.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151,1.0.33,0.0.0000 definitions=2015-05-22_03:2015-05-22,2015-05-22,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1146 Lines: 35 Hi Linus, My for-linus-4.1 branch has three more fixes: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus-4.1 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. Chris Mason (1) commits (+18/-0): Btrfs: fix regression in raid level conversion Filipe Manana (1) commits (+3/-0): Btrfs: fix racy system chunk allocation when setting block group ro Mark Fasheh (1) commits (+17/-0): btrfs: clear 'ret' in btrfs_check_shared() loop Total: (3) commits fs/btrfs/backref.c | 17 +++++++++++++++++ fs/btrfs/extent-tree.c | 20 ++++++++++++++++++++ fs/btrfs/volumes.c | 1 + 3 files changed, 38 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/