diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-30 12:25:34 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-30 12:25:35 +0100 |
| commit | 6e9a6cbe7d56107f5e0d7711905dc19bb4d7e3f0 (patch) | |
| tree | 88b1ecff0fb3ff9587037f39f734b1970fda7411 /block/nvme.c | |
| parent | ee9545ed1543020fba52fa5fb8f2b71c63e5389f (diff) | |
| parent | 7cef3d1290c9d675deff95029ba78e51fb727125 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- scsi-cd: Fix inserting read-only media in empty drive
- block/copy-on-read: Fix permissions for inactive node
- Test case fixes
# gpg: Signature made Tue 30 Jul 2019 12:21:48 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:
scsi-cd: Fix inserting read-only media in empty drive
block/copy-on-read: Fix permissions for inactive node
Fixes: add read-zeroes to 051.out
tests/multiboot: Fix load address of test kernels
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/nvme.c')
0 files changed, 0 insertions, 0 deletions