[GIT PULL] power tools for Linux-3.8

[GIT PULL] power tools for Linux-3.8

[Len Brown]

Hi Linus,

Please pull these power tools patches.
This updates the tree w/ the latest version of turbostat,
which reports temperature and - on SNB and later - Watts.

There will be a logical conflict with the uapi changes
which breaks the turbostat build.  It can be fixed this way:

diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
index e48ef07..f09641d 100644
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
@@ -5,7 +5,7 @@ DESTDIR         :=
 
 turbostat : turbostat.c
 CFLAGS +=      -Wall
-CFLAGS +=      -I../../../../arch/x86/include/
+CFLAGS +=      -I../../../../arch/x86/include/uapi/


thanks!
Len Brown, Intel Open Source Technology Center


The following changes since commit d91bb17c2a874493603c4d99db305d8caf2d180c:

  tools/power turbostat: graceful fail on garbage input (2012-11-01 00:22:00 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git next

for you to fetch changes up to 55f1f545f709a6023371848028a3029118855576:

  tools: Allow tools to be installed in a user specified location (2012-11-30 01:09:45 -0500)

----------------------------------------------------------------
Colin Ian King (1):
      tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu()

Josh Boyer (1):
      tools: Allow tools to be installed in a user specified location

Len Brown (5):
      tools/power/x86/turbostat: share kernel MSR #defines
      x86 power: define RAPL MSRs
      tools/power turbostat: prevent infinite loop on migration error path
      tools/power turbostat: fix output buffering issue
      tools/power turbostat: v3.0: monitor Watts and Temperature

Mark Asselstine (1):
      tools/power: turbostat: make Makefile a bit more capable

 arch/x86/include/asm/msr-index.h                   |  37 ++
 tools/power/x86/turbostat/Makefile                 |  21 +-
 tools/power/x86/turbostat/turbostat.8              | 103 ++--
 tools/power/x86/turbostat/turbostat.c              | 677 +++++++++++++++++++--
 tools/power/x86/x86_energy_perf_policy/Makefile    |   6 +-
 .../x86_energy_perf_policy.c                       |   2 +-
 6 files changed, 765 insertions(+), 81 deletions(-)

Re: [GIT PULL] power tools for Linux-3.8

[Linus Torvalds]

On Mon, Dec 17, 2012 at 11:17 AM, Len Brown <lenb@kernel.org> wrote:
>
> There will be a logical conflict with the uapi changes
> which breaks the turbostat build.  It can be fixed this way:

I *think* you meant to point me at the 'release' branch, so that's
what I pulled.

What you actually pointed me at was the 'next' branch:

>   git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git next

which had that fixed up as a separate commit (which breaks bisecting
the build, but I guess that doesn't much matter for something small
like turbostat).

            Linus