From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933941AbcCOEx7 (ORCPT ); Tue, 15 Mar 2016 00:53:59 -0400 Received: from ozlabs.org ([103.22.144.67]:48784 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbcCOEx5 (ORCPT ); Tue, 15 Mar 2016 00:53:57 -0400 Date: Tue, 15 Mar 2016 15:53:33 +1100 From: Stephen Rothwell To: Al Viro Cc: Benjamin LaHaise , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: linux-next: manual merge of the aio tree with the vfs tree Message-ID: <20160315155333.1758c173@canb.auug.org.au> In-Reply-To: <20160315043448.GE17997@ZenIV.linux.org.uk> References: <20160315150640.02a4db30@canb.auug.org.au> <20160315043448.GE17997@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Al, On Tue, 15 Mar 2016 04:34:48 +0000 Al Viro wrote: > > > between commit: > > > > 5955102c9984 ("wrappers for ->i_mutex access") > > > > from the vfs tree and commit: > > What. > > The. > > Hell? > > The first commit is in the mainline, not in vfs tree. And it had been > there since before -rc1. Sorry, my mistake. -- Cheers, Stephen Rothwell