lkml.org 
[lkml]   [2011]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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


\
 
 \ /
  Last update: 2011-12-19 12:31    [W:0.816 / U:0.880 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site