Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commit59ed3fe8d334e3247abb703b8f2eb7c0ac7afc62
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 27 Nov 2018 14:35:11 +0000 (27 14:35 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 27 Nov 2018 14:35:11 +0000 (27 14:35 +0000)
tree2673f4e05d742d375d4a35b589c738335e0f5a99
parent2264faa55f0f06795e61365a6b4891e53b7716a4
parent6da021815e752b3ca3a547eed53f3e92a8a35452
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- block: Fix crash on migration with explicit child nodes
- nvme: Fix spurious interrupts

# gpg: Signature made Tue 27 Nov 2018 11:59:40 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  nvme: Fix spurious interrupts
  iotests: Test migration with -blockdev
  block: Don't inactivate children before parents

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