From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751150AbcBBFQk (ORCPT ); Tue, 2 Feb 2016 00:16:40 -0500 Received: from e28smtp07.in.ibm.com ([125.16.236.7]:45306 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750790AbcBBFQi (ORCPT ); Tue, 2 Feb 2016 00:16:38 -0500 X-IBM-Helo: d28relay05.in.ibm.com X-IBM-MailFrom: chandan@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-next@vger.kernel.org From: Chandan Rajendra To: Stephen Rothwell Cc: David Sterba , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Al Viro Subject: Re: linux-next: manual merge of the btrfs-kdave tree with Linus' tree Date: Tue, 02 Feb 2016 10:46:20 +0530 Message-ID: <3386269.jJKUEthxLy@localhost.localdomain> User-Agent: KMail/4.14.7 (Linux/3.17.4-301.fc21.x86_64; KDE/4.14.9; x86_64; ; ) In-Reply-To: <20160202102216.60d1d550@canb.auug.org.au> References: <20160202102216.60d1d550@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-TM-AS-MML: disable x-cbid: 16020205-0025-0000-0000-000009B2A0BA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday 02 Feb 2016 10:22:16 Stephen Rothwell wrote: > Hi David, > > Today's linux-next merge of the btrfs-kdave tree got a conflict in: > > fs/btrfs/file.c > > between commit: > > 5955102c9984 ("wrappers for ->i_mutex access") > > from Linus' tree and commit: > > 9703fefe0b13 ("Btrfs: fallocate: Work with sectorsized blocks") > > from the btrfs-kdave tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). The fixes look good to me. Thanks for doing this. -- chandan