* Martin Schwidefsky <schwidefsky@xxxxxxxxxx> 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 -- 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
