From: Peter Zijlstra <peterz@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>,
linux-next@vger.kernel.org, Oleg Nesterov <oleg@redhat.com>,
Ingo Molnar <mingo@elte.hu>
Subject: Re: linux-next: manual merge of the cputime tree
Date: Tue, 25 Nov 2008 11:06:52 +0100 [thread overview]
Message-ID: <1227607612.4259.1428.camel@twins> (raw)
In-Reply-To: <20081125202105.2e80cf92.sfr@canb.auug.org.au>
On Tue, 2008-11-25 at 20:21 +1100, Stephen Rothwell wrote:
> Hi Martin,
>
> Today's linux-next merge of the cputime tree got a conflict in
> kernel/sched.c between commit 74fcd524e808975dd546dac847119f1995a7c622
> ("account_steal_time: kill the unneeded account_group_system_time()")
> from the tip-core tree and commit
> b7f4776b7f575ed8f288c44b64befd241fd44458 ("[PATCH] idle cputime
> accounting") from the cputime tree.
>
> The latter removes the call to account_group_system_time() as a side
> effect of further changes. So the fixup is to just take the latter
> change. I can carry the merge fix.
Martin,
Why does s390 do its own cpu accounting?
next prev parent reply other threads:[~2008-11-25 10:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 9:21 linux-next: manual merge of the cputime tree Stephen Rothwell
2008-11-25 10:06 ` Peter Zijlstra [this message]
2008-11-25 10:15 ` Martin Schwidefsky
2008-11-25 10:28 ` Peter Zijlstra
2008-11-25 10:32 ` Paul Mackerras
2008-11-25 11:00 ` Martin Schwidefsky
-- strict thread matches above, loose matches on Subject: below --
2008-11-11 6:56 Stephen Rothwell
2008-11-10 6:09 Stephen Rothwell
2008-11-10 8:45 ` Martin Schwidefsky
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=1227607612.4259.1428.camel@twins \
--to=peterz@infradead.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=oleg@redhat.com \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
/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).