diff options
| author | Peter Maydell | 2019-09-13 11:20:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-09-13 11:20:28 +0200 |
| commit | 7ff91278623f2ca6888c21b6567648c69692f783 (patch) | |
| tree | f7ef1303591817efac79306ff411845b8450d0a6 /memory.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.2-pull-re... (diff) | |
| parent | tests: make filemonitor test more robust to event ordering (diff) | |
| download | qemu-7ff91278623f2ca6888c21b6567648c69692f783.tar.gz qemu-7ff91278623f2ca6888c21b6567648c69692f783.tar.xz qemu-7ff91278623f2ca6888c21b6567648c69692f783.zip | |
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>
Diffstat (limited to 'memory.c')
0 files changed, 0 insertions, 0 deletions