From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Aug 2021 17:36:32 +0000 (-0700)
Subject: Merge tag 'perf_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6597
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98d006eb49cba379c50536b5de24f05df927c126;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'perf_urgent_for_v5.14' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Borislav Petkov:

 - Prevent the amd/power module from being removed while in use

 - Mark AMD IBS as not supporting content exclusion

 - Add a workaround for AMD erratum #1197 where IBS registers might not
   be restored properly after exiting CC6 state

 - Fix a potential truncation of a 32-bit variable due to shifting

 - Read the correct bits describing the number of configurable address
   ranges on Intel PT

* tag 'perf_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/amd/power: Assign pmu.module
  perf/x86/amd/ibs: Extend PERF_PMU_CAP_NO_EXCLUDE to IBS Op
  perf/x86/amd/ibs: Work around erratum #1197
  perf/x86/intel/uncore: Fix integer overflow on 23 bit left shift of a u32
  perf/x86/intel/pt: Fix mask of num_address_ranges
---

98d006eb49cba379c50536b5de24f05df927c126