summary refs log tree commit diff stats
path: root/docs/specs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-07-12 12:29:23 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-12 12:29:23 +0100
commitff82d3c73ec20d6f40e8bbfafe8ed5110bba5049 (patch)
tree3613b3317a26f609ea5246bc8a2345c02922cf33 /docs/specs
parent87130a0d43158f046873a7de7e1df45c45d6c8a8 (diff)
parent78dcf512efe72e211e6ca7783069364b01a1c05b (diff)
downloadfocaccia-qemu-ff82d3c73ec20d6f40e8bbfafe8ed5110bba5049.tar.gz
focaccia-qemu-ff82d3c73ec20d6f40e8bbfafe8ed5110bba5049.zip
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180712' into staging
- fix confusion around sizes in storage attribute migration
- remove NULL check on error_propagate() in virtio-ccw

# gpg: Signature made Thu 12 Jul 2018 10:27:28 BST
# gpg:                using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20180712:
  error: Remove NULL checks on error_propagate() calls
  s390x/storage attributes: fix CMMA_BLOCK_SIZE usage

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/specs')
0 files changed, 0 insertions, 0 deletions