diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-12 11:56:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-12 11:56:43 +0100 |
| commit | c7f79d678f8cb3bd54cdbe283f8fad9ecc31b643 (patch) | |
| tree | ed61b953d51be59f8b3256f16f6ef4437158df27 /hw | |
| parent | 05b656dcaa62bd91c97bcfd335a2802f2a2d678d (diff) | |
| parent | 6388147296cd4c841a7d4409ba622c200332a8c7 (diff) | |
| download | qemu-c7f79d678f8cb3bd54cdbe283f8fad9ecc31b643.zip qemu-c7f79d678f8cb3bd54cdbe283f8fad9ecc31b643.tar.gz qemu-c7f79d678f8cb3bd54cdbe283f8fad9ecc31b643.tar.bz2 | |
Merge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging
Block patches
One fix from Paolo on nvme:// driver.
One fix from Marc-Andre for iothread.
# gpg: Signature made Fri 12 Oct 2018 02:49:42 BST
# gpg: using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/block-pull-request:
nvme: correct locking around completion
iothread: fix crash with invalid properties
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions