OSDN Git Service

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 12 Jul 2019 14:38:22 +0000 (15:38 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 12 Jul 2019 14:38:22 +0000 (15:38 +0100)
commit1316b1ddc8a05e418c8134243f8bff8cccbbccb1
tree76a60f9909d15237449b8e7ef98e7e21d94f8c5d
parenta2a9d4adabe340617a24eb73a8b2a116d28a6b38
parent867eccfed84f96b54f4a432c510a02c2ce03b430
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- file-posix: Fix max transfer length for non-SCSI-passthrough
- iotests: Fix 082 reference output

# gpg: Signature made Fri 12 Jul 2019 14:49: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:
  file-posix: Use max transfer length/segment count only for SCSI passthrough
  iotests: Update 082 expected output

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