mbox

[GIT,PULL] Please pull my kvm-ppc-next branch

Message ID 20160711154636.GB8328@fergus.ozlabs.ibm.com
State Accepted
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next

Message

Paul Mackerras July 11, 2016, 3:46 p.m. UTC
Paolo,

Please do a pull from my kvm-ppc-next branch.  These commits have all
been in linux-next for a few weeks, and I would like them to go into
Linus' tree in the next merge window for v4.8.  Stephen Rothwell noted
a trivial merge conflict in linux-next with the fsl tree where we had
both added a #include line to asm/paca.h.  This may show up when Linus
merges this stuff into his tree, but it's trivially easy to fix (just
take both additions).

I haven't taken Suraj's latest series at this point since we're almost
up to the merge window, and I am on vacation and can't easily test his
series.

Thanks,
Paul.

The following changes since commit 64672c95ea4c2f7096e519e826076867e8ef0938:

  kvm: vmx: hook preemption timer support (2016-06-16 10:07:50 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next

for you to fetch changes up to fd7bacbca47a86a6f418440d8a5d7b7edbb2f8f9:

  KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt (2016-06-20 14:11:25 +1000)

----------------------------------------------------------------
Mahesh Salgaonkar (2):
      powerpc/powernv: Remove the usage of PACAR1 from opal wrappers
      KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt

Thomas Huth (2):
      KVM: PPC: Book3S PR: Fix illegal opcode emulation
      KVM: PPC: Book3S PR: Fix contents of SRR1 when injecting a program exception

 arch/powerpc/include/asm/hmi.h                 |  45 +++++++
 arch/powerpc/include/asm/paca.h                |   6 +
 arch/powerpc/kernel/Makefile                   |   2 +-
 arch/powerpc/kernel/exceptions-64s.S           |   4 +-
 arch/powerpc/kernel/hmi.c                      |  56 ++++++++
 arch/powerpc/kernel/idle_power7.S              |   5 +-
 arch/powerpc/kernel/traps.c                    |   5 +
 arch/powerpc/kvm/book3s_hv.c                   |  37 ++++++
 arch/powerpc/kvm/book3s_hv_ras.c               | 176 +++++++++++++++++++++++++
 arch/powerpc/kvm/book3s_hv_rmhandlers.S        |  65 ++++++++-
 arch/powerpc/kvm/book3s_pr.c                   |  12 +-
 arch/powerpc/kvm/emulate.c                     |   1 -
 arch/powerpc/platforms/powernv/opal-wrappers.S |   2 -
 13 files changed, 407 insertions(+), 9 deletions(-)
 create mode 100644 arch/powerpc/include/asm/hmi.h
 create mode 100644 arch/powerpc/kernel/hmi.c
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Paolo Bonzini July 11, 2016, 4:11 p.m. UTC | #1
On 11/07/2016 17:46, Paul Mackerras wrote:
>   git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next

Pulled to kvm/queue, thanks.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html