Failed in applying to current master (
apply log)
Maintainers: Samuel Thibault <samuel.thibault@ens-lyon.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Fam Zheng <fam@euphon.net>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Bin Meng <bin.meng@windriver.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Peter Xu <peterx@redhat.com>, David Hildenbrand <david@redhat.com>, Thomas Huth <thuth@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>
MAINTAINERS | 6 +-
tests/tcg/s390x/pgm-specification.mak | 15 +
include/crypto/aes.h | 8 +-
include/crypto/desrfb.h | 16 +-
include/disas/dis-asm.h | 68 +-
include/elf.h | 1800 +++++++++++++--------------
include/exec/cpu-all.h | 2 +-
include/hw/acpi/acpi.h | 4 +-
include/hw/elf_ops.h | 42 +-
include/hw/pci/pci_bridge.h | 10 +-
include/hw/pcmcia.h | 32 +-
include/hw/scsi/scsi.h | 2 +-
include/hw/sd/sd.h | 8 +-
include/hw/virtio/virtio.h | 2 +-
include/qemu/bitmap.h | 52 +-
include/qemu/compiler.h | 4 +-
include/qemu/osdep.h | 2 +-
include/qemu/uri.h | 32 +-
pc-bios/optionrom/optionrom.h | 262 ++--
target/s390x/cpu.h | 11 +
target/s390x/tcg/insn-data.h.inc | 46 +-
chardev/baum.c | 66 +-
hw/char/parallel.c | 24 +-
hw/char/serial.c | 68 +-
hw/core/loader.c | 42 +-
hw/dma/etraxfs_dma.c | 834 ++++++-------
hw/gpio/max7310.c | 22 +-
hw/input/ads7846.c | 54 +-
hw/rtc/m48t59.c | 150 +--
hw/rtc/twl92230.c | 160 +--
hw/scsi/scsi-bus.c | 4 +-
hw/sd/sd.c | 184 +--
hw/watchdog/wdt_ib700.c | 2 +-
softmmu/physmem.c | 2 +-
target/s390x/cpu.c | 26 +
target/s390x/tcg/excp_helper.c | 7 +-
target/s390x/tcg/mem_helper.c | 14 +-
target/s390x/tcg/translate.c | 79 +-
tests/tcg/s390x/ex-relative-long.c | 156 +++
tests/tcg/s390x/pgm-specification-user.c | 37 +
tests/tcg/s390x/rxsbg.c | 46 +
tests/unit/test-blockjob.c | 9 +-
tests/unit/test-rcu-list.c | 2 +-
util/bitops.c | 8 +-
util/envlist.c | 202 +--
tests/tcg/s390x/Makefile.softmmu-target | 20 +-
tests/tcg/s390x/Makefile.target | 12 +
tests/tcg/s390x/br-odd.S | 16 +
tests/tcg/s390x/cgrl-unaligned.S | 16 +
tests/tcg/s390x/clrl-unaligned.S | 16 +
tests/tcg/s390x/crl-unaligned.S | 16 +
tests/tcg/s390x/ex-odd.S | 17 +
tests/tcg/s390x/exrl-ssm-early.S | 43 +
tests/tcg/s390x/lgrl-unaligned.S | 16 +
tests/tcg/s390x/llgfrl-unaligned.S | 16 +
tests/tcg/s390x/lpsw.S | 36 +
tests/tcg/s390x/lpswe-early.S | 38 +
tests/tcg/s390x/lpswe-unaligned.S | 18 +
tests/tcg/s390x/lrl-unaligned.S | 16 +
tests/tcg/s390x/pgm-specification-softmmu.S | 40 +
tests/tcg/s390x/softmmu.ld | 20 +
tests/tcg/s390x/ssm-early.S | 41 +
tests/tcg/s390x/stgrl-unaligned.S | 16 +
tests/tcg/s390x/stosm-early.S | 41 +
tests/tcg/s390x/strl-unaligned.S | 16 +
65 files changed, 2952 insertions(+), 2140 deletions(-)
create mode 100644 tests/tcg/s390x/pgm-specification.mak
create mode 100644 tests/tcg/s390x/ex-relative-long.c
create mode 100644 tests/tcg/s390x/pgm-specification-user.c
create mode 100644 tests/tcg/s390x/rxsbg.c
create mode 100644 tests/tcg/s390x/br-odd.S
create mode 100644 tests/tcg/s390x/cgrl-unaligned.S
create mode 100644 tests/tcg/s390x/clrl-unaligned.S
create mode 100644 tests/tcg/s390x/crl-unaligned.S
create mode 100644 tests/tcg/s390x/ex-odd.S
create mode 100644 tests/tcg/s390x/exrl-ssm-early.S
create mode 100644 tests/tcg/s390x/lgrl-unaligned.S
create mode 100644 tests/tcg/s390x/llgfrl-unaligned.S
create mode 100644 tests/tcg/s390x/lpsw.S
create mode 100644 tests/tcg/s390x/lpswe-early.S
create mode 100644 tests/tcg/s390x/lpswe-unaligned.S
create mode 100644 tests/tcg/s390x/lrl-unaligned.S
create mode 100644 tests/tcg/s390x/pgm-specification-softmmu.S
create mode 100644 tests/tcg/s390x/softmmu.ld
create mode 100644 tests/tcg/s390x/ssm-early.S
create mode 100644 tests/tcg/s390x/stgrl-unaligned.S
create mode 100644 tests/tcg/s390x/stosm-early.S
create mode 100644 tests/tcg/s390x/strl-unaligned.S