Messages in this thread | | | Date | Mon, 19 Dec 2011 12:25:47 +0100 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the tip tree with the cputime tree |
| |
* Ingo Molnar <mingo@elte.hu> wrote:
> > All of it including "[S390] cputime: add sparse checking and > > cleanup" or just the fix for uptime ? > > I suspect we can take it all if it's all scheduling/time > related, and add new patches to sched/core to keep it all > concentrated in a single tree?
Btw., i'd suggest to keep your commits as-is and merge tip:sched/core into your tree - and send the result to me so that we can make that the new sched/core.
That way your commits are preserved and the conflicts are resolved.
Thanks,
Ingo
| |