Failed in applying to current master (
apply log)
Maintainers: Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Alex Williamson <alex.williamson@redhat.com>, "Cédric Le Goater" <clg@redhat.com>, Tony Krowiak <akrowiak@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>, Alexander Bulekov <alxndr@bu.edu>, Bandan Das <bsd@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Darren Kenny <darren.kenny@oracle.com>, Qiuhao Li <Qiuhao.Li@outlook.com>, Laurent Vivier <lvivier@redhat.com>
MAINTAINERS | 3 ++-
hw/s390x/ccw-device.h | 2 +-
include/hw/s390x/s390-ccw.h | 2 +-
hw/s390x/ccw-device.c | 3 ++-
hw/s390x/s390-ccw.c | 29 +++++++++++++----------------
hw/s390x/s390-virtio-ccw.c | 5 +++++
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 18 ++++++++----------
target/s390x/arch_dump.c | 2 +-
target/s390x/cpu_models.c | 9 +++++++++
tests/qtest/fuzz/qos_fuzz.c | 1 +
target/s390x/Kconfig | 5 +++++
12 files changed, 49 insertions(+), 32 deletions(-)