Re: [PATCH 2/2] lockdep: choose to continue lock debugging despitetaint

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/