[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120312154921.GB17153@pad.fieldses.org>
Date: Mon, 12 Mar 2012 11:49:21 -0400
From: "J. Bruce Fields" <bfields@...hat.com>
To: "Ted Ts'o" <tytso@....edu>
Cc: Bernd Schubert <bernd.schubert@...m.fraunhofer.de>,
linux-nfs@...r.kernel.org, linux-ext4@...r.kernel.org,
linux-fsdevel@...r.kernel.org, yong.fan@...mcloud.com,
sandeen@...hat.com, adilger@...mcloud.com
Subject: Re: [PATCH 5 3/4] nfsd_open(): rename 'int access' to 'int
may_flags' in nfsd_open()
On Mon, Mar 12, 2012 at 11:09:12AM -0400, Ted Ts'o wrote:
> On Fri, Mar 09, 2012 at 03:51:48PM -0500, Ted Ts'o wrote:
> >
> > 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.)
>
> Ping?
Whoops, sorry.
Looks perfect, thanks for handling these!
I'm running them through my usual regression tests and then I'll push
the result out soon, with a "here's why I'm merging this" comment on the
merge commit. (Though I can't see it would trigger Linus's usual
back-merge rant anyway, as it's obviously quite targetted, not a case of
"oh I think I'll update to -rc5 now".)
--b.
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists