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

* Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:

> > That way your commits are preserved and the conflicts are
> > resolved.
>
> Just did that and pushed out the result on
>
> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git cputime-tip

Hm, this fails spectacularly on 32-bit x86:

/home/mingo/tip/drivers/cpufreq/cpufreq_ondemand.c: In function 'get_cpu_idle_time_jiffy':
/home/mingo/tip/drivers/cpufreq/cpufreq_ondemand.c:137: error: expected ';' before ')' token
/home/mingo/tip/drivers/cpufreq/cpufreq_ondemand.c:137: error: expected statement before ')' token

Thanks,

Ingo


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