Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-07-31' into staging
commitb89041647422e2a8989ab1d521dd11f3e1eb5d20
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 31 Jul 2018 17:02:11 +0000 (31 18:02 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 31 Jul 2018 17:02:11 +0000 (31 18:02 +0100)
tree2b2bedd333fcbf1083f85718acb97dab1b9e56b6
parent42e76456cf68dc828b8dbd3c7e255197e9b5e57d
parent9a1054061c62311f6efcd88e4df0aa5203c7b39a
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-07-31' into staging

Monitor patches for 2018-07-31 (3.0.0-rc3)

# gpg: Signature made Tue 31 Jul 2018 16:46:16 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-monitor-2018-07-31:
  monitor: temporary fix for dead-lock on event recursion

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