summary refs log tree commit diff stats
path: root/monitor/monitor-internal.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-05-14 10:58:30 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-05-14 10:58:30 +0100
commit035b448b84f3557206abc44d786c5d3db2638f7d (patch)
tree2738bdf98127d2664072880f6f7b1d71ce5ddd98 /monitor/monitor-internal.h
parentd8f9d57dbd0caf225c47f12e9faea9180e79fe2a (diff)
parent9bbb7e0fe081efff2e41f8517c256b72a284fe9b (diff)
downloadfocaccia-qemu-035b448b84f3557206abc44d786c5d3db2638f7d.tar.gz
focaccia-qemu-035b448b84f3557206abc44d786c5d3db2638f7d.zip
Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-14' into staging
Changes:
- Christian Schoenebeck is now co-maintainer for 9pfs
- relax checks for O_NOATIME
- minor documentation updates

# gpg: Signature made Thu 14 May 2020 08:14:37 BST
# gpg:                using RSA key B4828BAF943140CEF2A3491071D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>" [full]
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>" [full]
# gpg:                 aka "[jpeg image of size 3330]" [full]
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/9p-next-2020-05-14:
  xen-9pfs: Fix log messages of reply errors
  9pfs: local: ignore O_NOATIME if we don't have permissions
  qemu-options.hx: 9p: clarify -virtfs vs. -fsdev
  MAINTAINERS: Upgrade myself as 9pfs co-maintainer

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor/monitor-internal.h')
0 files changed, 0 insertions, 0 deletions