]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160720' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 20 Jul 2016 19:59:05 +0000 (20:59 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 20 Jul 2016 19:59:05 +0000 (20:59 +0100)
commit3b55fbdcb048bf82e82c29b555d0918b83fc40a5
tree844b7da697d25d194e626ee3dddf6d911a28b949
parent6a426eb27ec17684808ab87374f51d6ed3a47835
parent2a79eb1a616a07b0e8c41430f03af254fefe219d
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160720' into staging

Fixes for s390x in the css area.

# gpg: Signature made Wed 20 Jul 2016 15:12:43 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20160720:
  s390x/css: provide a dev_path for css devices
  s390x/css: sch_handle_start_func() handles resume, too
  s390x/css: copy CCW format bit from ORB to SCSW

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>