Merge branch 'x86/cache' into perf/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 2 Oct 2018 07:51:41 +0000 (09:51 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 2 Oct 2018 07:51:41 +0000 (09:51 +0200)
commita4c9f26533eb547c8123e9a5f77517f61d19d2c2
tree9767715779be7314ea86b1a83ae96f72e5ddb0da
parent97e831e13015045c098e1187f9b8b8e9bace9413
parentdd45407c0b2445bc2aa0ecfea744d5af3a146577
Merge branch 'x86/cache' into perf/core, to resolve conflicts

Avoid conflict with upcoming perf/core patches, merge in the RDT perf work.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/core.c
arch/x86/include/asm/perf_event.h