* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Tejun,
>
> Today's linux-next merge of the workqueues tree got a conflict in
> kernel/sched.c between commit eae0c9dfb534cb3449888b9601228efa6480fdb5
> ("sched: Fix and clean up rate-limit newidle code") from the tip tree and
> commit 710c15b748f5ce9c573cc047f419cf007a677a9a ("sched: refactor
> try_to_wake_up() and implement try_to_wake_up_local()") from the
> workqueues tree.
Tejun,
Please submit scheduler patches to the scheduler tree. Such level of
refactoring of a critical scheduler component needs to go through the
regular scheduler channels. This is a frequently modified piece of code
and conflicts are likely in the future.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
