From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Subject: Re: [git pull] vfs.git; pile 1 Date: Mon, 23 Jul 2012 07:09:09 +0100 Message-ID: <20120723060909.GE31729@ZenIV.linux.org.uk> References: <20120722100920.GZ31729@ZenIV.linux.org.uk> <20120722202030.GB31729@ZenIV.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Stephen Rothwell , Trond Myklebust To: Linus Torvalds Return-path: Content-Disposition: inline In-Reply-To: <20120722202030.GB31729@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On Sun, Jul 22, 2012 at 09:20:30PM +0100, Al Viro wrote: > Result: for-linus-2 + v3.5 and for-linus + v3.5 give identical trees, > and for-linus-2 merges clean with nfs/nfs-for-3.6. Would you be OK > with pulling that one? Again, my apologies to everyone involved ;-/ > > If you are OK with pulling that one, the summary is unchanged, location is > git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus-2 BTW, Stephen, could you confirm that vfs.git#for-linus-2 has no conflicts with the rest of trees in linux-next? I've checked the lack of conflicts with nfs.git and you haven't mentioned any other conflicts, so I hope that this will do, but I haven't tried pulling and merging the rest of the stuff in -next; not with the link I'm behind right now... ;-/