diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-11 21:10:48 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-11 21:10:48 +0300 |
commit | 936b664fb20895277453c02be4f3a94d6ce2b3c8 (patch) | |
tree | dce695e7e8bce2d26fa7bdb7d2f6e2eba350d462 /arch/alpha/kernel/setup.c | |
parent | 301c8b1d7c2373f85ed5d944a8e9264dad36064c (diff) | |
parent | d4ba0b06306a70c99a43f9d452886a86e2d3bd26 (diff) | |
download | linux-936b664fb20895277453c02be4f3a94d6ce2b3c8.tar.xz |
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
Diffstat (limited to 'arch/alpha/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions