Merge tag 'kvmarm-fixes-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmar...
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 3 Oct 2019 10:08:50 +0000 (12:08 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 3 Oct 2019 10:08:50 +0000 (12:08 +0200)
commitd53a4c8e77dae2b71cd9b3fd249ae538f137caeb
tree14fd3036fbef9f86d921a54f193d0bc31b5ba596
parent24c29b7ac0da3e2eb589553f7a98bade6d0a0e60
parentaac60f1a867773de9eb164013d89c99f3ea1f009
Merge tag 'kvmarm-fixes-5.4-1' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm fixes for 5.4, take #1

- Remove the now obsolete hyp_alternate_select construct
- Fix the TRACE_INCLUDE_PATH macro in the vgic code
arch/arm64/kvm/hyp/switch.c