On Wed, Oct 17, 2007 at 08:59:53AM -0700, Linus Torvalds wrote:
quoted text
> > Please pull from:
> > 
> >         git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
> 
> This conflicts in nontrivial ways with
> 
> which I just merged from -mm.
> 
> I suspect it's trivial to fix up for somebody who knows/understands the 
> code, but I'm not that person, and I cannot verify the end result.
> 
> So can you please do the merge, and I'll pull the merged tree?
> 

OK, I've rebased and fixed up the patches with your latest git tree.

Could you please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

now?   Thanks!!

						- Ted
-
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/