aboutsummaryrefslogtreecommitdiff
path: root/crypto/block-luks.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-03-21 09:33:11 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-03-21 09:33:11 +0000
commit6532dcebb6160f94b6b278af5e73784164c669f6 (patch)
tree631956f639cfeb4def77abda251511f9ee5e500a /crypto/block-luks.c
parent62a172e6a77d9072bb1a18f295ce0fcf4b90a4f2 (diff)
parentdd154c4d9f48a44ad24e13f46033d0f10a05c923 (diff)
Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging
Merge I/O patch queue Fix problem with end of file handling with websock channels # gpg: Signature made Wed 20 Mar 2019 16:57:15 GMT # gpg: using RSA key BE86EBB415104FDF # 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/qio-next-pull-request: io: fix handling of EOF / error conditions in websock GSource Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'crypto/block-luks.c')
0 files changed, 0 insertions, 0 deletions