From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933775AbbJIRmh (ORCPT ); Fri, 9 Oct 2015 13:42:37 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:62815 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933417AbbJIRmf (ORCPT ); Fri, 9 Oct 2015 13:42:35 -0400 Date: Fri, 9 Oct 2015 13:42:13 -0400 From: Chris Mason To: Linus Torvalds , linux-kernel , linux-btrfs Subject: [GIT PULL] Btrfs Message-ID: <20151009174213.GA25218@ret.masoncoding.com> Mail-Followup-To: Chris Mason , Linus Torvalds , linux-kernel , linux-btrfs MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.5.23.1 (2014-03-12) X-Originating-IP: [192.168.52.123] 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-10-09_13:2015-10-09,2015-10-09,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, I have a few fixes in my for-linus-4.3 branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus-4.3 These are small and assorted. Neil's is the oldest, I dropped the ball thinking he was going to send it in. Filipe Manana (3) commits (+26/-12): Btrfs: update fix for read corruption of compressed and shared extents (+11/-8) Btrfs: send, fix corner case for reference overwrite detection (+5/-3) Btrfs: fix deadlock when finalizing block group creation (+10/-1) NeilBrown (1) commits (+5/-5): BTRFS: support NFSv2 export chandan (1) commits (+4/-0): Btrfs: open_ctree: Fix possible memory leak Total: (5) commits (+35/-17) fs/btrfs/disk-io.c | 4 ++++ fs/btrfs/export.c | 10 +++++----- fs/btrfs/extent-tree.c | 9 ++++++++- fs/btrfs/extent_io.c | 19 +++++++++++-------- fs/btrfs/send.c | 8 +++++--- fs/btrfs/transaction.c | 1 + fs/btrfs/transaction.h | 1 + 7 files changed, 35 insertions(+), 17 deletions(-)