From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 24 May 2019 19:27:00 +0000 (+0200)
Subject: Merge tag 'kvmarm-fixes-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-5.13.0-19.19~8445^2~28
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6bff2a3dc9ba6ef1054da1094554cc0c87f377ed;p=mirror_ubuntu-jammy-kernel.git

Merge tag 'kvmarm-fixes-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for 5.2-rc2

- Correctly annotate HYP-callable code to be non-traceable
- Remove Christoffer from the MAINTAINERS file as his request
---

6bff2a3dc9ba6ef1054da1094554cc0c87f377ed