| commit | 84a29c7efd02baa97b0d60d1e59e8357f7a5e0f1 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 28 Jul 2015 08:11:48 +0000 (28 09:11 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 28 Jul 2015 08:11:48 +0000 (28 09:11 +0100) | ||
| tree | fe6beef92dee5951a7b82add96e7beb0965a7125 | treesnapshot (tar.gz zip) |
| parent | f8787f8723eaca1be99e3b1873e54de163fffa93 | commitdiff |
| parent | 77c102c26ead946fe7589d4bddcdfa5cb431ebfe | commitdiff |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.4.0-rc3
# gpg: Signature made Mon Jul 27 16:19:17 2015 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block: qemu-iotests - add check for multiplication overflow in vpc
block: vpc - prevent overflow if max_table_entries >= 0x40000000
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Block layer patches for 2.4.0-rc3
# gpg: Signature made Mon Jul 27 16:19:17 2015 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block: qemu-iotests - add check for multiplication overflow in vpc
block: vpc - prevent overflow if max_table_entries >= 0x40000000
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>