summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-04-04 18:00:23 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-04-04 18:00:23 +0100
commit1413c663c9e02a8669e67ed6e9a21941a8df5f92 (patch)
tree3b1bfe9d41405b89860e7a580c682d2cb66efa92 /VERSION
parent2c9938c5d71a634fd71c731658f57d9ba6299bad (diff)
parent6d54af0ea9eeee70b4c0eb48bd2ae1d22b207dd4 (diff)
downloadqemu-1413c663c9e02a8669e67ed6e9a21941a8df5f92.tar.gz
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
Some 9pfs bugs fixes: potential hang at reset, migration blocker leak. # gpg: Signature made Tue 04 Apr 2017 17:07:55 BST # gpg: using DSA key 0x02FC3AEB0101DBC2 # gpg: Good signature from "Greg Kurz <groug@kaod.org>" # gpg: aka "Greg Kurz <groug@free.fr>" # gpg: aka "Greg Kurz <gkurz@linux.vnet.ibm.com>" # gpg: aka "Gregory Kurz (Groug) <groug@free.fr>" # gpg: aka "[jpeg image of size 3330]" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2 * remotes/gkurz/tags/for-upstream: 9pfs: clear migration blocker at session reset 9pfs: fix multiple flush for same request Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions