From: Ted Ts'o Subject: Re: [PATCH 5 3/4] nfsd_open(): rename 'int access' to 'int may_flags' in nfsd_open() Date: Fri, 9 Mar 2012 15:51:48 -0500 Message-ID: <20120309205148.GB5635@thunk.org> References: <20120109132158.2616029.30467.stgit@localhost.localdomain> <20120109132153.2616029.26302.stgit@localhost.localdomain> <20120306000837.GA17164@thunk.org> <20120306020819.GH31388@pad.fieldses.org> <20120306151816.GB32282@thunk.org> <20120306152842.GA8339@pad.fieldses.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Bernd Schubert , linux-nfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, yong.fan@whamcloud.com, sandeen@redhat.com, adilger@whamcloud.com To: "J. Bruce Fields" Return-path: Received: from li9-11.members.linode.com ([67.18.176.11]:45064 "EHLO test.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754819Ab2CIUvy (ORCPT ); Fri, 9 Mar 2012 15:51:54 -0500 Content-Disposition: inline In-Reply-To: <20120306152842.GA8339@pad.fieldses.org> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Tue, Mar 06, 2012 at 10:28:43AM -0500, J. Bruce Fields wrote: > > If so, I'll do a quick test merge and see if there are > > any conflicts. If so, I'll segregate out these patches into a > > separate pre-merge branch --- and then if you like you could pull them > > into your branch and we can deal with it that way. > > That sounds like a good way to do it regardless? Linus in general doesn't like cross tree merges (or any extraneous merges) unless they are absolutely necessary; but then, he trusts git merges more than many of us do. :-) I've put the the patch series on a separate patch, with a signed tag, at: git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git nfs-ext4-premerge Can you confirm that you've pulled it into your tree and it's landed in linux-next? I probably won't bother pulling it in mine unless there is definitely a merge conflict that I need to resolve. (I've checked and there do not appear to be any against linux-next as of last night.) - Ted