From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 24 Jul 2018 09:37:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
X-Git-Tag: qemu-xen-4.12.0-rc1~34
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=768cef2974fb1fa30dd188b043ea737e13fea477;p=qemu-xen.git

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging

Fix for -rc2

* Fix build failure on mips host

# gpg: Signature made Mon 23 Jul 2018 20:44:47 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-next-pull-request:
  i386: Rename enum CacheType members

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

768cef2974fb1fa30dd188b043ea737e13fea477