Re: [GIT PULL v2] timers updates for 3.15

[Ingo Molnar <mingo@kernel.org>]

* Frederic Weisbecker <fweisbec@gmail.com> wrote:

> Ingo, Thomas,
> 
> Please pull the timers/cputime-fix-steal-v3 branch that can be found at:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
> 	timers/cputime-fix-steal-v3
> 
> Only the last patch changed to address Peterz concern on arch Kbuild
> layout. This got sorted out by running the script from b119fa61d440f
> to alpabetically sort the entries.
> 
> ---
> The main purpose of this set is to fix a bug on full dynticks configs
> where steal time accounting appears to be zero in /proc/stat even
> after a few seconds of competing guests running busy loops in a same
> host CPU. It's not a regression though as it was there since the
> beginning with full dynticks.
> 
> So patch [4/6] ("cputime: Fix jiffies based cputime assumption on
> steal accounting") is the most important patch of the series. The rest
> is mostly preparatory work to fix the bug plus various cleanups.
> 
> Thanks,
> 	Frederic
> ---
> 
> Frederic Weisbecker (6):
>       cputime: Fix nsecs_to_cputime() return type cast
>       cputime: Default implementation of nsecs -> cputime conversion
>       cputime: Bring cputime -> nsecs conversion
>       cputime: Fix jiffies based cputime assumption on steal accounting
>       sched: Remove needless round trip nsecs <-> tick conversion of steal time
>       arch: Remove stub cputime.h headers
> 
> 
>  arch/alpha/include/asm/Kbuild         |  7 ++++---
>  arch/alpha/include/asm/cputime.h      |  6 ------
>  arch/cris/include/asm/Kbuild          |  3 ++-
>  arch/cris/include/asm/cputime.h       |  6 ------
>  arch/frv/include/asm/Kbuild           |  5 +++--
>  arch/frv/include/asm/cputime.h        |  6 ------
>  arch/m32r/include/asm/Kbuild          |  5 +++--
>  arch/m32r/include/asm/cputime.h       |  6 ------
>  arch/microblaze/include/asm/Kbuild    |  5 +++--
>  arch/microblaze/include/asm/cputime.h |  1 -
>  arch/mn10300/include/asm/Kbuild       |  3 ++-
>  arch/mn10300/include/asm/cputime.h    |  1 -
>  arch/score/include/asm/Kbuild         |  4 ++--
>  arch/score/include/asm/cputime.h      |  6 ------
>  arch/x86/include/asm/Kbuild           |  1 +
>  arch/x86/include/asm/cputime.h        |  1 -

Does this tree also address the heavy conflicts with tip:core/locking? 
If not then we should probably carry this in a separate branch that 
merges tip:core/locking and tip:timers/core.

Thanks,

	Ingo