* Frederic Weisbecker <[email protected]> wrote:
> > Side request: do you think you could merge them on kill-the-BKL
> > tree?
>
> Sorry, forget about this side request. I thought merging
> tip:master into tip:core/kill-the-BKL would make me suffer a rain
> of conflicts but actually I've just tried and I only encountered a
> very simple conflict in sched.c so it's very easy to manage it
> locally. Then we can keep the history of kill-the-BKL, for now
> it's good as is.
Ok - that's how we like topics anyway: as independent trees which
happen to be mostly conflict-free when merged into tip:master.
Ingo
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
