Merge tag 'perf-urgent-2021-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Jul 2021 18:10:48 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Jul 2021 18:10:48 +0000 (11:10 -0700)
commit936b664fb20895277453c02be4f3a94d6ce2b3c8
treedce695e7e8bce2d26fa7bdb7d2f6e2eba350d462
parent301c8b1d7c2373f85ed5d944a8e9264dad36064c
parentd4ba0b06306a70c99a43f9d452886a86e2d3bd26
Merge tag 'perf-urgent-2021-07-11' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "A fix and a hardware-enablement addition:

   - Robustify uncore_snbep's skx_iio_set_mapping()'s error cleanup

   - Add cstate event support for Intel ICELAKE_X and ICELAKE_D"

* tag 'perf-urgent-2021-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel/uncore: Clean up error handling path of iio mapping
  perf/x86/cstate: Add ICELAKE_X and ICELAKE_D support
arch/x86/events/intel/uncore_snbep.c