]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f39757 ef493f4)
Merge tag 'perf-urgent-2024-09-18' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Sep 2024 13:00:50 +0000 (15:00 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Sep 2024 13:00:50 +0000 (15:00 +0200)
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


Trivial merge
XArray, radix tree and IDR