On Thu, 25 Oct 2007, Andrew Morton wrote:
>
> There shouldn't have been conflicts here - if there were I wouldn't have
> sent those patches. Unless there were things in the ext4 pull which
> weren't present in the ext4 quilt tree which I included in 2.6.23-mm1?
Well, you merge your patch-series by patching.
You should have noticed by now that GNU patch in particular will happily
apply a patch whether it conflicts or not. So it's entirely possible that
it didn't conflict for you, but applied cleanly and sanely.
Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
