From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758141AbcAKC7W (ORCPT <rfc822;w@1wt.eu>);
	Sun, 10 Jan 2016 21:59:22 -0500
Received: from fieldses.org ([173.255.197.46]:58414 "EHLO fieldses.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757976AbcAKC7U (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sun, 10 Jan 2016 21:59:20 -0500
Date: Sun, 10 Jan 2016 21:59:18 -0500
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, NeilBrown <neilb@suse.de>
Subject: Re: linux-next: manual merge of the vfs tree with the nsfd tree
Message-ID: <20160111025918.GB25396@fieldses.org>
References: <20160111121632.26fd5873@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160111121632.26fd5873@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jan 11, 2016 at 12:16:32PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in:
> 
>   fs/namei.c
> 
> between commit:
> 
>   1932ac9d7cef ("nfsd: don't hold i_mutex over userspace upcalls")
> 
> from the nfsd tree and commit:
> 
>   bbddca8e8fac ("nfsd: don't hold i_mutex over userspace upcalls")
> 
> from the vfs tree.
> 
> Similar patch, but slightly different. :-(
> 
> I fixed it up (I used the vfs tree version) and can carry the fix as
> necessary (no action is required).

Thanks, I've dropped my version.

--b.