From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.fusionio.com ([66.114.96.30]:42576 "EHLO mx1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758396Ab2HIQB2 (ORCPT ); Thu, 9 Aug 2012 12:01:28 -0400 Date: Thu, 9 Aug 2012 12:01:26 -0400 From: Chris Mason To: Linus Torvalds , lkml , Linux Btrfs List Subject: [GIT PULL 2/2] Btrfs merge fix Message-ID: <20120809160126.GA32103@shiny> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-btrfs-owner@vger.kernel.org List-ID: Hi Linus, Please pull my for-linus-3.6 branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus-3.6 It fixes a merging error in rc1. The calls to mnt_want_write should have been removed. Alexander Block (1): Btrfs: remove mnt_want_write call in btrfs_mksubvol fs/btrfs/ioctl.c | 5 ----- 1 file changed, 5 deletions(-)