Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: 9dacc908462693719d84ec594e839434959cf6f1 https://github.com/qemu/qemu/commit/9dacc908462693719d84ec594e839434959cf6f1 Author: Christian Borntraeger <borntrae...@de.ibm.com> Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths: M target/s390x/gen-features.c Log Message: ----------- s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1 We disabled ais for 2.10, so let's also remove it from the z14 default model. Fixes: 3f2d07b3b01e ("s390x/ais: for 2.10 stable: disable ais facility") CC: qemu-sta...@nongnu.org Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> Message-Id: <20170927072030.35737-2-borntrae...@de.ibm.com> Signed-off-by: Cornelia Huck <coh...@redhat.com> Commit: d666cacaeab904fb6e8361ee791b6e8ab8448577 https://github.com/qemu/qemu/commit/d666cacaeab904fb6e8361ee791b6e8ab8448577 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M target/s390x/gen-features.c Log Message: ----------- Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170927' into staging Another s390x compat fix that should make it into 2.10.1. # gpg: Signature made Wed 27 Sep 2017 10:30:16 BST # gpg: using RSA key 0xDECF6B93C6F02FAF # gpg: Good signature from "Cornelia Huck <co...@cornelia-huck.de>" # gpg: aka "Cornelia Huck <hu...@linux.vnet.ibm.com>" # gpg: aka "Cornelia Huck <cornelia.h...@de.ibm.com>" # gpg: aka "Cornelia Huck <coh...@kernel.org>" # gpg: aka "Cornelia Huck <coh...@redhat.com>" # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF * remotes/cohuck/tags/s390x-20170927: s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1 Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/08df7e5577e4...d666cacaeab9