OSDN Git Service

Merge branch 'x86/urgent' into x86/cache, to pick up dependent fix
authorIngo Molnar <mingo@kernel.org>
Tue, 9 Oct 2018 06:50:10 +0000 (08:50 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 9 Oct 2018 06:50:10 +0000 (08:50 +0200)
commitfc8eaa85681fa72dc6a4e46f01c92e4fba83d0ab
treeb044fab426f2167ceeb37ed6fe58f7f11b10cebd
parent2cc81c6992248ea37d0241bc325977bab310bc3b
parent49e00eee00612b1357596fed8a88b621a7648c14
Merge branch 'x86/urgent' into x86/cache, to pick up dependent fix

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