diff options
| author | Peter Maydell | 2019-07-30 15:23:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-30 15:23:07 +0200 |
| commit | 8517bf84056282ea3e27772d51f76db3a6fa2d26 (patch) | |
| tree | 525df53f207f0eb32ed7b6a8d9e2be2971b9dd3d /hw | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | nvme: Limit blkshift to 12 (for 4 kB blocks) (diff) | |
| download | qemu-8517bf84056282ea3e27772d51f76db3a6fa2d26.tar.gz qemu-8517bf84056282ea3e27772d51f76db3a6fa2d26.tar.xz qemu-8517bf84056282ea3e27772d51f76db3a6fa2d26.zip | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-07-30' into staging
Block patch for 4.1.0-rc3:
- Fix CID 1403771 in block/nvme.c
# gpg: Signature made Tue 30 Jul 2019 13:51:52 BST
# gpg: using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg: issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/maxreitz/tags/pull-block-2019-07-30:
nvme: Limit blkshift to 12 (for 4 kB blocks)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions
