From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 1 Aug 2018 09:07:04 +0000 (+0200)
Subject: Merge branch 'pm-tools'
X-Git-Tag: v4.18-rc8~28^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9b7c19e96cededec6b0435933adefbd56cad37ab;p=users%2Fhch%2Fuuid.git

Merge branch 'pm-tools'

Merge turbostat utility fixes for final 4.18:

 - Fix the -S option on 1-CPU systems.
 - Fix computations using incorrect processor core counts.
 - Fix the x2apic debug message.
 - Fix logical node enumeration to allow for non-sequential physical nodes.
 - Fix reported family on modern AMD processors.
 - Clarify the RAPL column information in the man page.

* pm-tools:
  tools/power turbostat: version 18.07.27
  tools/power turbostat: Read extended processor family from CPUID
  tools/power turbostat: Fix logical node enumeration to allow for non-sequential physical nodes
  tools/power turbostat: fix x2apic debug message output file
  tools/power turbostat: fix bogus summary values
  tools/power turbostat: fix -S on UP systems
  tools/power turbostat: Update turbostat(8) RAPL throttling column description
---

9b7c19e96cededec6b0435933adefbd56cad37ab