On Fri, Feb 15, 2002 at 03:30:40PM -0800, William Lee Irwin III wrote:
> On Fri, Feb 15, 2002 at 03:22:21PM -0800, Mike Fedyk wrote:
> > Yep, I understand. When I was patching in rmap12f I had to manually
> > merge the little bit into mm/bootmem.c and the offset was several hundred
> > lines. Then I realized just how much WLI's bootmem patch changes.
>
> It's a rewrite. Of course it changes the whole file. Lucky for you it
> interacts with nothing else. I seem to remember this conflict being
> somewhat trivial to resolve though.
Yes, it was quite easy to hand merge/fix it up when I added in rmap12f (was
12e... so not much to change.)
Mike
-
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/
This archive was generated by hypermail 2b29 : Fri Feb 15 2002 - 21:01:10 EST