From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Sep 2024 13:00:50 +0000 (+0200)
Subject: Merge tag 'perf-urgent-2024-09-18' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.12~421
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=941c122da5c8355335dc16011c1c291a32cd1118;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'perf-urgent-2024-09-18' of git://git./linux/kernel/git/tip/tip

Pull perf event fixes from Ingo Molnar:
 "Left over from the v6.11 cycle:

   - Fix energy-pkg event enumeration on certain AMD CPUs

   - Set up the LBR branch stack for BPF counting events too"

* tag 'perf-urgent-2024-09-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Allow to setup LBR for counting event for BPF
  perf/x86/rapl: Fix the energy-pkg event for AMD CPUs
---

941c122da5c8355335dc16011c1c291a32cd1118