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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
