From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Paris Subject: Re: linux-next: manual merge of the fsnotify tree with the vfs tree Date: Tue, 09 Feb 2010 08:02:54 -0500 Message-ID: <1265720575.18730.24.camel@localhost> References: <20100209163708.b7ae6d05.sfr@canb.auug.org.au> <20100209054521.GK30031@ZenIV.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com ([209.132.183.28]:34373 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754225Ab0BINDG (ORCPT ); Tue, 9 Feb 2010 08:03:06 -0500 In-Reply-To: <20100209054521.GK30031@ZenIV.linux.org.uk> Sender: linux-next-owner@vger.kernel.org List-ID: To: Al Viro Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Tue, 2010-02-09 at 05:45 +0000, Al Viro wrote: > On Tue, Feb 09, 2010 at 04:37:08PM +1100, Stephen Rothwell wrote: > > Hi Eric, > > > > Today's linux-next merge of the fsnotify tree got a conflict in > > fs/namei.c between commit 123df2944c436c80640c4281c5bc9c7950b18687 ("Lose > > the new_name argument of fsnotify_move()") from the vfs tree and commit > > 2df5764e29a813f6ba63be094ab8aadc704a78fd ("fsnotify: use unsigned char * > > for dentry->d_name.name") from the fsnotify tree. > > > > The former removed the code changed by the latter, so I used the former. > > FWIW, I've put two commits (audit_inode_child and fsnotify_move ones) into > a new not-for-rebase branch (for-fsnotify) and told Eric, so hopefully > he'll just pull it into fsnotify tree. I know I merged it yesterday, but now I can't for the life of me find the branch I merged it onto, obviously it wasn't my for-next branch. I'm so confused. Anyway, yes, I'll merge it again right now..... -Eric