From: Charles Wang <0oo0.hust@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Huacai Chen <chenhc@lemote.com>,
Charles Wang <muming.wq@taobao.com>,
Ingo Molnar <mingo@kernel.org>,
stable@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: Seems like "sched: Add missing call to calc_load_exit_idle()" should be reverted in 3.5 branch
Date: Mon, 08 Oct 2012 19:23:28 +0800 [thread overview]
Message-ID: <5072B7B0.7050507@gmail.com> (raw)
In-Reply-To: <CAFzf2XxYab=MUdffjR7VtftW=Xv45KQFbd3YSn2ogJpUWf+wqA@mail.gmail.com>
On 10/05/2012 09:39 AM, Jonathan Nieder wrote:
> Peter Zijlstra wrote:
>
>> I can't find wtf went wrong either, the initial patch 5167e8d5417bf5c
>> contains both hunks, but in that case the fixup 749c8814f0 doesn't make
>> sense, not can I find anything in merge commits using:
>>
>> git log -S calc_load_exit_idle kernel/time/tick-sched.c
>
> git log -m -p --first-parent -Scalc_load_exit_idle -- kernel/time/tick-sched.c
>
> finds 3992c0321258 ("Merge branch 'timers-core-for-linus'",
> 2012-07-22), which seems to have mismerged 2ac0d98fd624 ("nohz: Make
> nohz API agnostic against idle ticks cputime accounting").
That's it. Patch 2ac0d98fd624 and 19f5f7364("nohz: Separate idle
sleeping time accounting from nohz logic") are produced on 2011-07-28,
merged on 2012-07-22, right after 5167e8d5417bf5c, but applied before
5167e8d5417bf5c.
These two patches changed tick_nohz_idle_exit, which causing Peter's
patch 5167e8d5417bf5c couldn't fully be applied.
There should be conflict being reported, but why we don't get is really
confused.
>
> Thanks,
> Jonathan
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
next prev parent reply other threads:[~2012-10-08 11:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAAhV-H54CJdg+UekpucZ=kOgCY5r5vvYQ+v4VwAMTCv+mCedXA@mail.gmail.com>
2012-10-04 17:46 ` Seems like "sched: Add missing call to calc_load_exit_idle()" should be reverted in 3.5 branch Greg Kroah-Hartman
2012-10-04 18:31 ` Peter Zijlstra
2012-10-04 22:27 ` Greg Kroah-Hartman
2012-10-05 10:21 ` Peter Zijlstra
2012-10-05 16:17 ` Greg Kroah-Hartman
2012-10-05 17:10 ` Jonathan Nieder
2012-10-05 17:23 ` Peter Zijlstra
2012-10-08 11:33 ` Charles Wang
2012-10-05 1:39 ` Jonathan Nieder
2012-10-08 11:23 ` Charles Wang [this message]
2012-10-05 0:35 陈华才
-- strict thread matches above, loose matches on Subject: below --
2012-10-13 3:39 陈华才
2012-10-13 6:28 ` Greg Kroah-Hartman
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=5072B7B0.7050507@gmail.com \
--to=0oo0.hust@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=chenhc@lemote.com \
--cc=gregkh@linuxfoundation.org \
--cc=jrnieder@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=muming.wq@taobao.com \
--cc=stable@vger.kernel.org \
/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).