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
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
