From: Stefan Hajnoczi Date: Tue, 15 Nov 2016 12:07:53 +0000 (+0000) Subject: Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97e53cf82ca0ffa9abe2def2fabc5fc75b914d90;p=qemu.git Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging # gpg: Signature made Tue 15 Nov 2016 07:37:27 AM GMT # gpg: using RSA key 0xEF04965B398D6211 # 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 * jasowang/tags/net-pull-request: docs: fix COLO architecture diagram net: fix sending of data with -net socket, listen backend net: skip virtio-net config of deleted nic's peers Message-id: 1479195830-4725-1-git-send-email-jasowang@redhat.com Signed-off-by: Stefan Hajnoczi --- 97e53cf82ca0ffa9abe2def2fabc5fc75b914d90