commit 2d5438f4c6fdaa34c5d7de89a5331b8dbcd920af
author Linus Torvalds <torvalds@linux-foundation.org> Sun May 28 07:37:23 2023 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> Sun May 28 07:37:23 2023 -0400
tree 215047b424a03c9f5e65d94821de143d94d1bf39
parent abbf7fa15b7c140da7893f9c910b4762ac99ae7a
parent 38776cc45eb7603df4735a0410f42cffff8e71a1

Merge tag 'perf-urgent-2023-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Thomas Gleixner:
 "A small set of perf fixes:

   - Make the MSR-readout based CHA discovery work around broken
     discovery tables in some SPR firmwares.

   - Prevent saving PEBS configuration which has software bits set that
     cause a crash when restored into the relevant MSR"

* tag 'perf-urgent-2023-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/uncore: Correct the number of CHAs on SPR
  perf/x86/intel: Save/restore cpuc->active_pebs_data_cfg when using guest PEBS