diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-01-08 10:28:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-01-08 10:28:06 +0000 |
| commit | 8188c3cda586dc445cac875b7d21c0c960dbe97e (patch) | |
| tree | 84e4241d749c11fac87c766b06b297f28f8a99d2 /hw/vfio/pci.c | |
| parent | 0c1eccd368af8805ec0fb11e6cf25d0684d37328 (diff) | |
| parent | 5c23704e4725f935b3171787f00e9922a7fc58cb (diff) | |
| download | qemu-8188c3cda586dc445cac875b7d21c0c960dbe97e.zip qemu-8188c3cda586dc445cac875b7d21c0c960dbe97e.tar.gz qemu-8188c3cda586dc445cac875b7d21c0c960dbe97e.tar.bz2 | |
Merge tag 'pull-loongarch-20240106' of https://gitlab.com/gaosong/qemu into staging
pull-loongarch-20240106
Fixs patch conflict
# -----BEGIN PGP SIGNATURE-----
#
# iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZZi5pAAKCRBAov/yOSY+
# 35iIA/4uXw92i0HJ3KK9NxzZlP9gwld6dATvincKNUpUgplK3NtBpRlVKm9NzLH8
# Jdg84k7D5pNXfWAfomT+R3UMnL8R/zZZqeCCd60JE0Kbn4gCyCou2QuLKuWxPvNM
# Jklf4mifq+gplg7lDF0GTLo8MUzhAmV8AuG7lUZb6IQJ68ui8A==
# =NnLa
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 06 Jan 2024 02:23:32 GMT
# gpg: using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF
# gpg: Good signature from "Song Gao <m17746591750@163.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: B8FF 1DA0 D2FD CB2D A09C 6C2C 40A2 FFF2 3926 3EDF
* tag 'pull-loongarch-20240106' of https://gitlab.com/gaosong/qemu:
target/loongarch: move translate modules to tcg/
target/loongarch/meson: move gdbstub.c to loongarch.ss
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vfio/pci.c')
0 files changed, 0 insertions, 0 deletions