diff options
author | Peter Maydell | 2021-04-05 23:15:38 +0200 |
---|---|---|
committer | Peter Maydell | 2021-04-05 23:15:38 +0200 |
commit | 109918d24a3bb9ed3d05beb34ea4ac6be443c138 (patch) | |
tree | deb3e2f92241faf4a48096da3eaa379d1c4768c5 /hw/net/tulip.c | |
parent | Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210405' into... (diff) | |
parent | hw/block/nvme: expose 'bootindex' property (diff) | |
download | qemu-109918d24a3bb9ed3d05beb34ea4ac6be443c138.tar.gz qemu-109918d24a3bb9ed3d05beb34ea4ac6be443c138.tar.xz qemu-109918d24a3bb9ed3d05beb34ea4ac6be443c138.zip |
Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging
emulated nvme fixes
# gpg: Signature made Mon 05 Apr 2021 18:33:34 BST
# gpg: using RSA key 522833AA75E2DCE6A24766C04DE1AF316D4F0DE9
# gpg: Good signature from "Klaus Jensen <its@irrelevant.dk>" [unknown]
# gpg: aka "Klaus Jensen <k.jensen@samsung.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DDCA 4D9C 9EF9 31CC 3468 4272 63D5 6FC5 E55D A838
# Subkey fingerprint: 5228 33AA 75E2 DCE6 A247 66C0 4DE1 AF31 6D4F 0DE9
* remotes/nvme/tags/nvme-fixes-for-6.0-pull-request:
hw/block/nvme: expose 'bootindex' property
hw/block/nvme: remove description for zoned.append_size_limit
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/tulip.c')
0 files changed, 0 insertions, 0 deletions