On Fri, Jun 01, 2007 at 03:47:35PM -0700, Andrew Morton wrote:
quoted text
> Right.  I did a lot of tricksy work for rc3-mm1 to merge git-ocfs2 on top
> of Nick's stuff.  Then I repulled your tree and lost it all.  This is
> because I was dumb and I fixed rc3-mm1's git-ocfs.patch rather than doing a
> separate fix-rejects-in-git-ocfs2.patch.
> 
> This is all unique-to-akpm stuff which you don't need to worry about ;)

Ok, I am no longer concerned! :)


quoted text
> > So, which of Nick's patches are we talking about here?
> > 
> > Btw, I know you tend to handle rejects yourself, but if it's a major PITA
> > I'd be happy to help out. Boy, I'm hoping I didn't just ask for a load of
> > trouble there :)
> 
> Is OK - I'll move Nick's patches back to behind the git trees and it'll all come
> good.

Phew ok. Once again, thanks for all the work you do getting the ocfs2 git
patches into -mm.
	--Mark

--
Mark Fasheh
Senior Software Developer, Oracle
mark.fasheh@oracle.com
-
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/