From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 17 Apr 2018 10:13:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
X-Git-Tag: pull-nvme-20200902~1807
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0df2121693b9f0cc866b58a97db9c6441027e148;p=qemu-nvme.git

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

i386: Don't automatically enable FEAT_KVM_HINTS bits

Bug fix for "-cpu host" with newer kernels.

# gpg: Signature made Mon 16 Apr 2018 17:37:53 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: Don't automatically enable FEAT_KVM_HINTS bits

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

0df2121693b9f0cc866b58a97db9c6441027e148