Failed in applying to current master (
apply log)
Maintainers: Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, Stefan Berger <stefanb@linux.vnet.ibm.com>, "Dr. David Alan Gilbert" <dave@treblig.org>, "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>, Matthew Rosato <mjrosato@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Laurent Vivier <laurent@vivier.eu>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
docs/about/deprecated.rst | 62 -----------------------------------------
docs/about/removed-features.rst | 47 +++++++++++++++++++++++++++++++
docs/specs/tpm.rst | 4 +--
docs/user/main.rst | 6 ----
qapi/run-state.json | 11 --------
include/hw/s390x/s390-pci-bus.h | 2 ++
bsd-user/main.c | 3 +-
hw/i386/pc.c | 4 +--
hw/s390x/s390-pci-bus.c | 26 +++++++++++------
hw/s390x/s390-pci-kvm.c | 34 ++++++++++++++++++++--
hw/s390x/s390-virtio-ccw.c | 8 ++++++
linux-user/main.c | 2 --
system/runstate.c | 8 ------
system/vl.c | 37 +-----------------------
tests/qtest/test-hmp.c | 1 -
hmp-commands.hx | 13 ---------
qemu-options.hx | 46 ------------------------------
tests/qemu-iotests/183.out | 4 +--
tests/qemu-iotests/234.out | 8 +++---
tests/qemu-iotests/262.out | 4 +--
tests/qemu-iotests/280.out | 2 +-
tests/vm/netbsd | 1 -
22 files changed, 121 insertions(+), 212 deletions(-)