diff options
| author | Peter Maydell | 2019-07-04 11:28:25 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-04 11:28:25 +0200 |
| commit | b2e1bc59f0f1ce0fd3962757ec4a334363b37f47 (patch) | |
| tree | 741c86785520741d43de580233a00176b53f642c /linux-user | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190703-pull-request' ... (diff) | |
| parent | sunhme: ensure that RX descriptor ring overflow is indicated to client driver (diff) | |
| download | qemu-b2e1bc59f0f1ce0fd3962757ec4a334363b37f47.tar.gz qemu-b2e1bc59f0f1ce0fd3962757ec4a334363b37f47.tar.xz qemu-b2e1bc59f0f1ce0fd3962757ec4a334363b37f47.zip | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20190702' into staging
qemu-sparc queue
# gpg: Signature made Tue 02 Jul 2019 23:14:13 BST
# gpg: using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg: issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-20190702:
sunhme: ensure that RX descriptor ring overflow is indicated to client driver
sunhme: fix return values from sunhme_receive() during receive packet processing
sunhme: flush any queued packets when HME_MAC_RXCFG_ENABLE bit is raised
sunhme: fix incorrect constant in sunhme_can_receive()
sunhme: add trace event for logging PCI IRQ
sun4m: set default display type to TCX
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions