From: Peter Maydell Date: Mon, 26 Mar 2018 10:02:50 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2ffd221d07a671f72354a063d3080f244ec80b20;p=qemu.git 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) " # 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 --- 2ffd221d07a671f72354a063d3080f244ec80b20