From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 31 Oct 2019 10:07:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-311019-1' into... 
X-Git-Url: https://repo.jachan.dev/qemu.git/commitdiff_plain/741a90038bef13d64e051fb35c4e894ab16d1554?hp=-c

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-311019-1' into staging

Fixes to get CI green again

  - fix m68k acceptance tests (Cleber)
  - stop build breakage (Daniel)

# gpg: Signature made Thu 31 Oct 2019 10:00:53 GMT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-next-311019-1:
  Acceptance test: update kernel for m68k/q800 test
  Acceptance test: cancel test if m68k kernel packages goes missing
  tests: fix conditional for disabling XTS test

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

741a90038bef13d64e051fb35c4e894ab16d1554