From: Peter Maydell Date: Tue, 16 Jul 2019 15:05:42 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190716' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190716' into staging straighten out some things in the gen15 cpu model # gpg: Signature made Tue 16 Jul 2019 14:50:34 BST # gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF # gpg: issuer "cohuck@redhat.com" # gpg: Good signature from "Cornelia Huck " [unknown] # gpg: aka "Cornelia Huck " [full] # gpg: aka "Cornelia Huck " [full] # gpg: aka "Cornelia Huck " [unknown] # gpg: aka "Cornelia Huck " [unknown] # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF * remotes/cohuck/tags/s390x-20190716: s390x/cpumodel: change internal name of vxpdeh to match description s390x/cpumodel: also change name of vxbeh s390x/cpumodel: remove esort from the default model Signed-off-by: Peter Maydell --- 1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7