Re: Linux v2.5.52

From: Larry McVoy (lm@bitmover.com)
Date: Mon Dec 16 2002 - 15:39:32 EST


> Alternatively, never EVER make a patch against the "current kernel
> version". Only make a patch against the _last_ kernel that you merged
> with, and if I cannot apply it I will tell you so. Making a patch just
> between your tree and mine will _always_ end up losing fixes.

I think this is a good approach. If people sent Linus patches with some
indication of the baseline of the patch, such as BASELINE=v2.5.49 in the
header of the patch, I'd be willing to go make bk import -temail do
the right thing, which would probably be to try and patch it in in the
working tree, but if that didn't work, it would do

        bk clone -l -r$BASELINE tree tree.$BASELINE
        cd tree.$BASLINE
        bk import -temail ....
        cd ../tree
        bk pull ../tree.$BASELINE && rm -rf ../tree.$BASELINE

and you'd get BK to merge most of the work.

-- 
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 
-
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 : Mon Dec 23 2002 - 22:00:14 EST