summary refs log tree commit diff stats
path: root/linux-user/syscall.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-07-16 16:05:42 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-07-16 16:05:42 +0100
commit1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7 (patch)
tree0615516e4363405a3297d441d5d9998756bba824 /linux-user/syscall.c
parent697f59243f5a28b8a243ff5ad59e34bbecffcae1 (diff)
parent5d8866c89817998a3d9c3055d5dc2b5a8e78658a (diff)
downloadfocaccia-qemu-1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7.tar.gz
focaccia-qemu-1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7.zip
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 <conny@cornelia-huck.de>" [unknown]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
0 files changed, 0 insertions, 0 deletions