From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 23 Jan 2015 12:09:15 +0000 (+0100)
Subject: Merge branch 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.0-rc1~96^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6156df9d32141e5f1abb43078c56f2e5a0cb294;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'arm64/common-esr-macros' of git://git./linux/kernel/git/mark/linux into kvm-next

ESR_ELx definitions clean-up from Mark Rutland.

* 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux:
  arm64: kvm: decode ESR_ELx.EC when reporting exceptions
  arm64: kvm: remove ESR_EL2_* macros
  arm64: remove ESR_EL1_* macros
  arm64: kvm: move to ESR_ELx macros
  arm64: decode ESR_ELx.EC when reporting exceptions
  arm64: move to ESR_ELx macros
  arm64: introduce common ESR_ELx_* definitions

This is required by the patch "arm/arm64: KVM: add tracing support for
arm64 exit handler" in Christoffer's pull request.
---

c6156df9d32141e5f1abb43078c56f2e5a0cb294