From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Nov 2023 16:34:12 +0000 (-0800)
Subject: Merge tag 'perf-urgent-2023-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e81fe505202fdc07b1925aa70fca5e2a714eb259;p=linux.git

Merge tag 'perf-urgent-2023-11-26' of git://git./linux/kernel/git/tip/tip

Pull x86 perf event fix from Ingo Molnar:
 "Fix a bug in the Intel hybrid CPUs hardware-capabilities enumeration
  code resulting in non-working events on those platforms"

* tag 'perf-urgent-2023-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Correct incorrect 'or' operation for PMU capabilities
---

e81fe505202fdc07b1925aa70fca5e2a714eb259