diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-26 11:02:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-26 11:02:50 +0100 |
| commit | 2ffd221d07a671f72354a063d3080f244ec80b20 (patch) | |
| tree | d690ef5304a7ee5edde9c00286c775dfcb796d78 /scripts | |
| parent | 7b1db0908d88f0c9cfac24e214ff72a860692e23 (diff) | |
| parent | 7587855cd23755a7a6bd01b026611465f5584ecd (diff) | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 26 Mar 2018 07:53:27 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
net/vde: print error on vde_open() failure
virtio_net: flush uncompleted TX on reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions