Merge branch 'x86/cpu' into x86/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 15 Mar 2022 11:52:51 +0000 (12:52 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 15 Mar 2022 11:52:51 +0000 (12:52 +0100)
commit9cea0d46f52f31c077a83a9b9e4e3887adfbecbe
tree3910cec9563476f23108de6618ad55cf0c87e62a
parent8c490b42fe91c10d5756efe56014240c669e7720
parent08f253ec3767bcfafc5d32617a92cee57c63968e
Merge branch 'x86/cpu' into x86/core, to resolve conflicts

Conflicts:
arch/x86/include/asm/cpufeatures.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/cpufeatures.h
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process.c