diff options
| author | Peter Maydell | 2017-04-03 12:15:33 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-04-03 12:15:33 +0200 |
| commit | 9eb5adae26b828219e82f17c854cdf1f192f9565 (patch) | |
| tree | a0b07301b732e7f91fca8233c7ee8d70d68fe006 /ui/input-linux.c | |
| parent | Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (diff) | |
| parent | pseries: Enforce homogeneous threads-per-core (diff) | |
| download | qemu-9eb5adae26b828219e82f17c854cdf1f192f9565.tar.gz qemu-9eb5adae26b828219e82f17c854cdf1f192f9565.tar.xz qemu-9eb5adae26b828219e82f17c854cdf1f192f9565.zip | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170403' into staging
ppc patch queue 2017-04-03
A single bugfix in this pull request, for an ugly assert() failure, if
the user ignores the information in query-hotpluggable-cpus and tries
to hot add CPUs to pseries with bad parameters.
# gpg: Signature made Mon 03 Apr 2017 11:06:58 BST
# gpg: using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-2.9-20170403:
pseries: Enforce homogeneous threads-per-core
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-linux.c')
0 files changed, 0 insertions, 0 deletions