Merge tag 'perf_urgent_for_v5.15_rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Oct 2021 17:32:27 +0000 (10:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Oct 2021 17:32:27 +0000 (10:32 -0700)
commit3a399a2bc465e7fb0e788bfbffefc9399d628a25
tree31a486ecde8826c9ad2328a7151acbfae228bd03
parent52c3c170623d994c468c1ee9cc36c56bbd6d6e56
parentf792565326825ed806626da50c6f9a928f1079c1
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