Failed in applying to current master (
apply log)
Maintainers: Stefan Berger <stefanb@linux.vnet.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Ben Widawsky <ben.widawsky@intel.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Yuval Shaia <yuval.shaia.ml@gmail.com>, Alistair Francis <Alistair.Francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Palmer Dabbelt <palmer@dabbelt.com>, Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>
backends/tpm/tpm_emulator.c | 2 +-
hw/arm/meson.build | 11 +++++++----
hw/cpu/meson.build | 4 ++--
hw/cxl/cxl-cdat.c | 2 +-
hw/cxl/cxl-host.c | 2 +-
hw/display/meson.build | 2 +-
hw/i386/pc.c | 2 +-
hw/intc/meson.build | 12 ++++++------
hw/pci-host/i440fx.c | 3 +--
hw/pci-host/q35.c | 3 +--
hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++
hw/ssi/sifive_spi.c | 2 +-
hw/tpm/meson.build | 4 ++--
hw/usb/ccid-card-emulated.c | 2 +-
hw/usb/meson.build | 4 ++--
include/hw/i386/pc.h | 2 +-
tests/qtest/dbus-display-test.c | 5 +++--
tests/qtest/migration-test.c | 2 +-
tests/qtest/test-hmp.c | 2 +-
tests/unit/test-crypto-tlssession.c | 4 ++--
tests/unit/test-io-channel-tls.c | 2 +-
21 files changed, 43 insertions(+), 35 deletions(-)