From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 15 Jan 2015 15:44:44 +0000 (+0000)
Subject: Merge branch 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~2354^2~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ce339a9e60d417e2747ff7c4869d9691a606e49;p=firefly-linux-kernel-4.4.55.git

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

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
---

0ce339a9e60d417e2747ff7c4869d9691a606e49