diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-05 16:02:00 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-05 16:02:00 +0100 |
commit | 0175409df42c20257171df87657dd705558aa94d (patch) | |
tree | e7255938964ee71f0a728f8c4683689420617356 /VERSION | |
parent | e94867ed5f241008d0f53142b2704a075f9ed505 (diff) | |
parent | 74aae7b22b8a67cf31937b2f4bdefe2881e799e9 (diff) |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio fix for 2.4
Fixes migration in virtio 1 mode.
We still have a known bug with memory hotplug, it doesn't
look like we can fix that in time for 2.4.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 05 Aug 2015 15:57:39 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
virtio: fix 1.0 virtqueue migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions