diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-12-15 13:06:40 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-12-15 13:06:40 +0100 |
| commit | 333bce5aac9e8cb7f6b27e0122a224d17be4dd5d (patch) | |
| tree | 7a171a51d9a999f90dd6f17f2b7dd0997dbc1a38 /kernel/sysctl_binary.c | |
| parent | KVM: x86: em_ret_far overrides cpl (diff) | |
| parent | arm/arm64: KVM: Require in-kernel vgic for the arch timers (diff) | |
| download | linux-333bce5aac9e8cb7f6b27e0122a224d17be4dd5d.tar.gz linux-333bce5aac9e8cb7f6b27e0122a224d17be4dd5d.zip | |
Merge tag 'kvm-arm-for-3.19-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
Second round of changes for KVM for arm/arm64 for v3.19; fixes reboot
problems, clarifies VCPU init, and fixes a regression concerning the
VGIC init flow.
Conflicts:
arch/ia64/kvm/kvm-ia64.c [deleted in HEAD and modified in kvmarm]
Diffstat (limited to 'kernel/sysctl_binary.c')
0 files changed, 0 insertions, 0 deletions