| commit | 4c2c1015905fa1d616750dfe024b4c0b35875950 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 23 Mar 2018 10:20:54 +0000 (23 10:20 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 23 Mar 2018 10:20:54 +0000 (23 10:20 +0000) | ||
| tree | deac0c236e295564b2dbf5b45346ecf0b06fb4ac | treesnapshot (tar.gz zip) |
| parent | d522e0bd18364f6d784d43edab35b0563d21f6f3 | commitdiff |
| parent | 06a97edac172f52971d7bdca6bb56a1edcb1b8f6 | commitdiff |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20180323' into staging
s390x: Fixes for 2.12
- Fix for the s390 cpumodel
- Forbid multifunction PCI devices
# gpg: Signature made Fri 23 Mar 2018 09:06:31 GMT
# gpg: using RSA key 117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20180323:
s390x/cpumodel: fix feature groups and breakage of MSA8
s390x/pci: forbid multifunction pci device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
s390x: Fixes for 2.12
- Fix for the s390 cpumodel
- Forbid multifunction PCI devices
# gpg: Signature made Fri 23 Mar 2018 09:06:31 GMT
# gpg: using RSA key 117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20180323:
s390x/cpumodel: fix feature groups and breakage of MSA8
s390x/pci: forbid multifunction pci device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>