From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 10 Nov 2017 16:01:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into... 
X-Git-Tag: qemu-xen-4.11.0-rc1~66
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4ffa88c99c54d2a30f79e3dbecec50b023eff1c8;p=qemu-xen.git

Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging

Merge qcrypto 2017/11/08 v1

# gpg: Signature made Wed 08 Nov 2017 11:06:38 GMT
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qcrypto-2017-11-08-1:
  crypto: afalg: fix a NULL pointer dereference
  tests: Run the luks tests in test-crypto-block only if encryption is available

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

4ffa88c99c54d2a30f79e3dbecec50b023eff1c8