diff options
| author |   Radim Krčmář <rkrcmar@redhat.com> | 2017-11-09 16:25:22 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-09 16:25:22 +0100 |
| commit | 61d750773df388632b11a6170098e2865977e1f6 (patch) | |
| tree | c74679134fdf619b200ab0fe281dcdb9cfe44fb1 /virt | |
| parent | Merge tag 'kvm-arm-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into next (diff) | |
| parent | KVM: PPC: Book3S HV: Cosmetic post-merge cleanups (diff) | |
| download | linux-dev-61d750773df388632b11a6170098e2865977e1f6.tar.xz linux-dev-61d750773df388632b11a6170098e2865977e1f6.zip | |
Merge tag 'kvm-ppc-next-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Second PPC KVM update for 4.15
This merges in my kvm-ppc-fixes branch to resolve the conflicts
between the fixes that have been applied there and the changes
made in my patch series to allow HPT guests to run on a radix
host on POWER9. It also resolves another conflict in the code
for the KVM_CAP_PPC_HTM capability.
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions