From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 30 Mar 2019 00:41:22 +0000 (+0100)
Subject: Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: v5.1-rc4~21^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59cc8cd60c786ae54715daff851e9d7c2436bc8b;p=thirdparty%2Flinux.git

Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pull turbostat utility updates for 5.1 from Len Brown:

"Misc fixes and updates."

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: update version number
  tools/power turbostat: Warn on bad ACPI LPIT data
  tools/power turbostat: Add checks for failure of fgets() and fscanf()
  tools/power turbostat: Also read package power on AMD F17h (Zen)
  tools/power turbostat: Add support for AMD Fam 17h (Zen) RAPL
  tools/power turbostat: Do not display an error on systems without a cpufreq driver
  tools/power turbostat: Add Die column
  tools/power turbostat: Add Icelake support
  tools/power turbostat: Cleanup CNL-specific code
  tools/power turbostat: Cleanup CC3-skip code
  tools/power turbostat: Restore ability to execute in topology-order
---

59cc8cd60c786ae54715daff851e9d7c2436bc8b