Messages in this thread | | | Date | Mon, 19 Dec 2011 17:30:09 +0100 | From | Ingo Molnar <> | Subject | Re: 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
| |