From: Ingo Molnar <mingo@elte.hu>
To: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Glauber Costa <glommer@parallels.com>
Subject: Re: linux-next: manual merge of the tip tree with the cputime tree
Date: Mon, 19 Dec 2011 17:30:09 +0100 [thread overview]
Message-ID: <20111219163009.GC10017@elte.hu> (raw)
In-Reply-To: <20111219152409.3a2c213e@de.ibm.com>
* 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
next prev parent reply other threads:[~2011-12-19 16:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-19 4:40 linux-next: manual merge of the tip tree with the cputime tree Stephen Rothwell
2011-12-19 8:08 ` Ingo Molnar
2011-12-19 9:11 ` Martin Schwidefsky
2011-12-19 10:35 ` Ingo Molnar
2011-12-19 11:25 ` Ingo Molnar
2011-12-19 14:24 ` Martin Schwidefsky
2011-12-19 16:30 ` Ingo Molnar [this message]
2011-12-19 19:06 ` Martin Schwidefsky
2011-12-20 11:09 ` Ingo Molnar
2011-12-19 12:31 ` Martin Schwidefsky
2011-12-19 13:43 ` Glauber Costa
2011-12-19 14:19 ` Martin Schwidefsky
2011-12-19 14:08 ` Peter Zijlstra
2011-12-19 14:25 ` Martin Schwidefsky
2011-12-20 10:19 ` Glauber Costa
-- strict thread matches above, loose matches on Subject: below --
2011-12-07 4:09 Stephen Rothwell
2011-12-07 11:35 ` Glauber Costa
2011-12-07 11:59 ` Martin Schwidefsky
2011-10-25 7:44 Stephen Rothwell
2011-10-25 7:40 Stephen Rothwell
2011-10-25 15:29 ` Michal Hocko
2011-10-25 7:35 Stephen Rothwell
2011-10-25 15:28 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111219163009.GC10017@elte.hu \
--to=mingo@elte.hu \
--cc=glommer@parallels.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).