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

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

Pull perf fixes from Borislav Petkov:

 - Make sure the destroy callback is reset when a event initialization
   fails

 - Update the event constraints for Icelake

 - Make sure the active time of an event is updated even for inactive
   events

* tag 'perf_urgent_for_v5.15_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: fix userpage->time_enabled of inactive events
  perf/x86/intel: Update event constraints for ICX
  perf/x86: Reset destroy callback on event init failure
---

3a399a2bc465e7fb0e788bfbffefc9399d628a25