From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 3 May 2018 09:27:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=98bae9c4afb4f5c1ee1c9ffbb2e9708df9fddbed;p=qmiga%2Fqemu.git

Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

Just one trace

# gpg: Signature made Wed 02 May 2018 07:59:38 BST
# gpg:                using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg:                 aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/for-upstream:
  9p: add trace event for v9fs_setattr()

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

98bae9c4afb4f5c1ee1c9ffbb2e9708df9fddbed