From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jan 2023 19:20:12 +0000 (-0800)
Subject: Merge tag 'perf-urgent-2023-01-06' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.7~3789
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7a0853d650b381921732ff5bca618432a279033;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'perf-urgent-2023-01-06' of git://git./linux/kernel/git/tip/tip

Pull perf fix from Ingo Molnar:
 "Intel RAPL updates for new model IDs"

* tag 'perf-urgent-2023-01-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/rapl: Add support for Intel Emerald Rapids
  perf/x86/rapl: Add support for Intel Meteor Lake
  perf/x86/rapl: Treat Tigerlake like Icelake
---

d7a0853d650b381921732ff5bca618432a279033