diff options
| author | Peter Maydell | 2019-07-12 12:06:48 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-12 12:06:48 +0200 |
| commit | a2a9d4adabe340617a24eb73a8b2a116d28a6b38 (patch) | |
| tree | 85ea9fd4b3fd39cbe1fe30282378289b235a59d0 /hw/timer/hpet.c | |
| parent | Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into ... (diff) | |
| parent | xics/kvm: Always set the MASKED bit if interrupt is masked (diff) | |
| download | qemu-a2a9d4adabe340617a24eb73a8b2a116d28a6b38.tar.gz qemu-a2a9d4adabe340617a24eb73a8b2a116d28a6b38.tar.xz qemu-a2a9d4adabe340617a24eb73a8b2a116d28a6b38.zip | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190712' into staging
ppc patch queue for 2019-07-12
First 4.1 hard freeze pull request. Not much here, just a bug fix for
the XICS interrupt controller and a SLOF firmware update to fix a bug
with IP discovery when there are multiple NICs.
# gpg: Signature made Fri 12 Jul 2019 06:51:24 BST
# gpg: using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-4.1-20190712:
xics/kvm: Always set the MASKED bit if interrupt is masked
pseries: Update SLOF firmware image
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/hpet.c')
0 files changed, 0 insertions, 0 deletions