public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Borislav Petkov <bp@alien8.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] x86/cpu changes for v5.6
Date: Wed, 29 Jan 2020 12:35:09 +0100	[thread overview]
Message-ID: <20200129113509.GB89586@gmail.com> (raw)
In-Reply-To: <CAHk-=wjoZfKFHL0wSsfnm32zv=zWNxtJcPob+1z2+P-tMcdoCg@mail.gmail.com>


* Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Tue, Jan 28, 2020 at 9:57 AM Ingo Molnar <mingo@kernel.org> 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@linux-foundation.org>
   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

  reply	other threads:[~2020-01-29 11:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-28 17:57 [GIT PULL] x86/cpu changes for v5.6 Ingo Molnar
2020-01-28 20:48 ` Linus Torvalds
2020-01-29 11:35   ` Ingo Molnar [this message]
2020-01-28 21:15 ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200129113509.GB89586@gmail.com \
    --to=mingo@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=akpm@linux-foundation.org \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox