summary refs log tree commit diff stats
path: root/hw/net/virtio-net.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-11-26 12:36:40 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-11-26 12:36:40 +0000
commit4ecc984210ca1bf508a96a550ec8a93a5f833f6c (patch)
tree52447becb3534260d9f85fdd9d0f4b68b5b1d0ad /hw/net/virtio-net.c
parenta5f80c16f204e1348ba6d4edfd6e9dbd7b4ccbc3 (diff)
parent6478dd745dca49d63250500cd1aeca1c41cd6f89 (diff)
downloadfocaccia-qemu-4ecc984210ca1bf508a96a550ec8a93a5f833f6c.tar.gz
focaccia-qemu-4ecc984210ca1bf508a96a550ec8a93a5f833f6c.zip
Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.2-rc3' into staging
RISC-V Patches for 4.2-rc3

This tag contains two patches that I'd like to target for 4.2-rc3:

* A fix to the DT entry for the SiFive test finisher.
* A fix to the spike board's HTIF interface.

This passes "make check" and boots OE for me.

# gpg: Signature made Mon 25 Nov 2019 20:51:13 GMT
# gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
# gpg:                issuer "palmer@dabbelt.com"
# gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [unknown]
# gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 00CE 76D1 8349 60DF CE88  6DF8 EF4C A150 2CCB AB41

* remotes/palmer/tags/riscv-for-master-4.2-rc3:
  hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()
  RISC-V: virt: This is a "sifive,test1" test finisher

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions