]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Sun, 21 Jan 2018 11:43:43 +0000 (22:43 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 21 Jan 2018 11:43:43 +0000 (22:43 +1100)
commit9a4e60be2461fef0c12a0d5ab310ee15eb6126ec
treeeaaed61828654237ace607f45b5ba3aa42ce1160
parent6cebf17929c8b8de217babe7d7cd7f45550cff41
parentd5115a8aa0e1cfa4e17fd4aefe0a84af38c1e7c2
Merge branch 'topic/ppc-kvm' into next

Merge the topic branch we share with kvm-ppc, this brings in two xive
commits, one from Paul to rework HMI handling, and a minor cleanup to
drop an unused flag.
arch/powerpc/include/asm/reg.h
arch/powerpc/kvm/book3s_hv_ras.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/sysdev/xive/common.c