Failed in applying to current master (
apply log)
pc-bios/s390-ccw/cio.h | 232 +++++++++++++++++++--------------------
pc-bios/s390-ccw/helper.h | 2 +-
pc-bios/s390-ccw/s390-ccw.h | 12 +-
pc-bios/s390-ccw/virtio-scsi.h | 2 +-
pc-bios/s390-ccw/virtio.h | 4 +-
pc-bios/s390-ccw/main.c | 1 -
pc-bios/s390-ccw/netmain.c | 1 -
pc-bios/s390-ccw/virtio-blkdev.c | 12 +-
pc-bios/s390-ccw/virtio-scsi.c | 4 +-
pc-bios/s390-ccw/virtio.c | 12 +-
pc-bios/s390-ccw.img | Bin 42608 -> 42608 bytes
pc-bios/s390-ccw/Makefile | 2 +-
pc-bios/s390-ccw/start.S | 149 +++++++++++++------------
pc-bios/s390-netboot.img | Bin 67232 -> 67232 bytes
tests/tcg/s390x/head64.S | 7 +-
15 files changed, 220 insertions(+), 220 deletions(-)