projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e831e dd45407)
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)
Avoid conflict with upcoming perf/core patches, merge in the RDT perf work.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/events/core.c patch | diff1 | diff2 | blob | history
arch/x86/include/asm/perf_event.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/events/core.c
Simple merge
diff --cc arch/x86/include/asm/perf_event.h
Simple merge
Domain: System / Kernel;