From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 13 Sep 2019 09:20:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/filemon-test-pull-request' into... 
X-Git-Tag: v4.2.0-rc0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ff91278623f2ca6888c21b6567648c69692f783;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/berrange/tags/filemon-test-pull-request' into staging

Fix filemonitor test broken with newest Linux kernel

# gpg: Signature made Wed 11 Sep 2019 10:31:05 BST
# gpg:                using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/filemon-test-pull-request:
  tests: make filemonitor test more robust to event ordering

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

7ff91278623f2ca6888c21b6567648c69692f783