diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-04-08 17:53:18 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-04-08 17:53:18 +0100 |
| commit | 5263724b78f89cdea2354c8e92c53bac1b4641a3 (patch) | |
| tree | 3a422bbb0f4646b29cf7b8b847408c5a74c4a408 /include/hw/pci | |
| parent | 2c573106279495795449b0d0373464b597dfe316 (diff) | |
| parent | ab63817119b03b95f7dce6fae036e6d063ad63fb (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- hmp: Fix drive_add ... format=help crash
- block: Forward 'discard' to temporary overlay
# gpg: Signature made Mon 08 Apr 2019 16:43:20 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:
hmp: Fix drive_add ... format=help crash
block: Forward 'discard' to temporary overlay
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/pci')
0 files changed, 0 insertions, 0 deletions