diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 09:34:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 09:34:18 +0000 |
| commit | 3c07587d49458341510360557c849e93e9afaf59 (patch) | |
| tree | aa382e652f5561dea2d7c724313e0710cdee86fd /qom | |
| parent | d93ae5b69621b7ec6ecfa405ec656d5b5f5e4770 (diff) | |
| parent | b41d320fef705289d2b73f4949731eb2e189161d (diff) | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-next-20151111' into staging
ppc patch queue - 2015-11-11
Highlights:
- Updated SLOF version for "pseries machine
- Bugfix / cleanup for KVM hash page table allocation
# gpg: Signature made Wed 11 Nov 2015 02:30:51 GMT using RSA key ID 20D9B392
# 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: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-next-20151111:
spapr: Handle failure of KVM_PPC_ALLOCATE_HTAB ioctl
ppc: Let kvmppc_reset_htab() return 0 for !CONFIG_KVM
pseries: Update SLOF firmware image to qemu-slof-20151103
ppc: Add/Re-introduce MMU model definitions needed by PR KVM
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom')
0 files changed, 0 insertions, 0 deletions