From: Richard Henderson Date: Fri, 17 Dec 2021 16:36:25 +0000 (-0800) Subject: Merge tag 's390x-2021-12-17' of https://gitlab.com/thuth/qemu into staging X-Git-Tag: v7.0.0-rc0~125 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3;p=thirdparty%2Fqemu.git Merge tag 's390x-2021-12-17' of https://gitlab.com/thuth/qemu into staging * Small fixes for the s390x PCI code * Fix reset handling of the diag318 data * Ease timeout problem of the new msys2-64bit job # gpg: Signature made Fri 17 Dec 2021 02:01:45 AM PST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth " [unknown] # gpg: aka "Thomas Huth " [unknown] # gpg: aka "Thomas Huth " [unknown] # gpg: aka "Thomas Huth " [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: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 's390x-2021-12-17' of https://gitlab.com/thuth/qemu: gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices s390x/pci: add supported DT information to clp response s390x/pci: use the passthrough measurement update interval s390x/pci: don't use hard-coded dma range in reg_ioat s390x/pci: use a reserved ID for the default PCI group MAINTAINERS: update email address of Christian Borntraeger s390: kvm: adjust diag318 resets to retain data Signed-off-by: Richard Henderson --- 48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3