diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-10-11 22:48:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-11 22:54:03 +0200 |
| commit | 8f4156d58713b058e9aeebb28ffbe5f45ae57b47 (patch) | |
| tree | f4fd0167e871eeb1dea4a2387e59d348960b69e9 /kernel/events | |
| parent | 25e56847821f7375bdee7dae1027c7917d07ce4b (diff) | |
| parent | f454b18e07f518bcd0c05af17a2239138bff52de (diff) | |
Merge branch 'x86/urgent' into perf/core, to resolve conflict
Resolve an MSR enumeration conflict.
Conflicts:
arch/x86/include/asm/msr-index.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
0 files changed, 0 insertions, 0 deletions