Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
commitb62b7ed0fc9c58e373b8946c9bd2e193be98dae6
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 20 Sep 2017 19:33:48 +0000 (20 20:33 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 20 Sep 2017 19:33:48 +0000 (20 20:33 +0100)
tree0b69dcabbe91a156be2cff896ac5e0ded05ce250
parentd3f5433c7b4aa2d59c6de4175743f4126e181aea
parent772a73692ecb52bace0cff6f95df62f59b8cabe0
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

These patches fix regressions in 2.10

# gpg: Signature made Wed 20 Sep 2017 07:51:07 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: check the size of transport buffer before marshaling
  9pfs: fix name_to_path assertion in v9fs_complete_rename()
  9pfs: fix readdir() for 9p2000.u

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