Re: [GIT PULL] x86/cpu changes for v5.6

From: Ingo Molnar
Date: Wed Jan 29 2020 - 06:35:15 EST



* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

> On Tue, Jan 28, 2020 at 9:57 AM Ingo Molnar <mingo@xxxxxxxxxx> wrote:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus
>
> No diffstat in the pull request?
>
> The shortlog does match, and the diffstat I get looks sane, so I'm
> pulling it, but please fix whatever thing that caused the diffstat to
> not show in the email..
>
> Linus

My bad: I erased the patch part manually and went too far accidentally. :-/

Just for the record, this looks good:

commit c0275ae758f8ce72306da200b195d1e1d66d0a8d
Merge: f6170f0afbe2 283bab980978
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Jan 28 12:46:42 2020 -0800

And the missing diffstat is attached below.

Thanks,

Ingo

=============>

MAINTAINERS | 2 +-
arch/x86/Kconfig.cpu | 8 ++
arch/x86/boot/mkcpustr.c | 1 +
arch/x86/include/asm/cpufeatures.h | 1 +
arch/x86/include/asm/msr-index.h | 14 +--
arch/x86/include/asm/perf_event.h | 22 +++--
arch/x86/include/asm/processor.h | 11 +--
arch/x86/include/asm/vmx.h | 105 ++++++++++----------
arch/x86/include/asm/vmxfeatures.h | 86 ++++++++++++++++
arch/x86/kernel/cpu/Makefile | 6 +-
arch/x86/kernel/cpu/bugs.c | 7 ++
arch/x86/kernel/cpu/centaur.c | 37 +------
arch/x86/kernel/cpu/common.c | 3 +
arch/x86/kernel/cpu/cpu.h | 4 +
arch/x86/kernel/cpu/feat_ctl.c | 145 +++++++++++++++++++++++++++
arch/x86/kernel/cpu/intel.c | 49 +--------
arch/x86/kernel/cpu/mce/intel.c | 15 +--
arch/x86/kernel/cpu/mkcapflags.sh | 15 ++-
arch/x86/kernel/cpu/proc.c | 15 +++
arch/x86/kernel/cpu/tsx.c | 5 +-
arch/x86/kernel/cpu/zhaoxin.c | 37 +------
arch/x86/kvm/Kconfig | 10 +-
arch/x86/kvm/vmx/nested.c | 4 +-
arch/x86/kvm/vmx/vmx.c | 67 ++++---------
arch/x86/kvm/vmx/vmx.h | 2 +-
arch/x86/kvm/x86.c | 2 +-
drivers/idle/intel_idle.c | 2 +-
tools/arch/x86/include/asm/msr-index.h | 14 +--
tools/power/x86/turbostat/turbostat.c | 4 +-
tools/testing/selftests/kvm/Makefile | 4 +-
tools/testing/selftests/kvm/include/x86_64/processor.h | 726 +------------------------------------------------------------------------------------------------------------------------------------
tools/testing/selftests/kvm/lib/x86_64/vmx.c | 8 +-
32 files changed, 432 insertions(+), 999 deletions(-)
create mode 100644 arch/x86/include/asm/vmxfeatures.h
create mode 100644 arch/x86/kernel/cpu/feat_ctl.c