Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commit62ae78c77a6d83e6acf083d24e1be8544a5fe7bc
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 30 Jul 2019 15:35:17 +0000 (30 16:35 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 30 Jul 2019 15:35:17 +0000 (30 16:35 +0100)
tree3710d605790737d981a9e34539b5c302370cc3f5
parent8517bf84056282ea3e27772d51f76db3a6fa2d26
parent68174160144c9263366a4397ef8b417698e2735c
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- fdc: Fix inserting read-only media in empty drive

# gpg: Signature made Tue 30 Jul 2019 16:32:14 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests/118: Test inserting a read-only medium
  fdc: Fix inserting read-only media in empty drive

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