From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Jul 2021 18:10:48 +0000 (-0700)
Subject: Merge tag 'perf-urgent-2021-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.14-rc1~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=936b664fb20895277453c02be4f3a94d6ce2b3c8;p=users%2Fdwmw2%2Flinux.git

Merge tag 'perf-urgent-2021-07-11' of git://git.kernel.org/pub/scm/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
---

936b664fb20895277453c02be4f3a94d6ce2b3c8