[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging

[patchbot@xxxxxxx]

commit 97e53cf82ca0ffa9abe2def2fabc5fc75b914d90
Merge: 1ed9bd12c86b417669c22b4342ba27aec20c87e4 
a38299bf431a891c0a21a77199e7148c0983413e
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Tue Nov 15 12:07:53 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Tue Nov 15 12:07:53 2016 +0000

    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) 
<jasowang@xxxxxxxxxx>"
    # 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@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 docs/COLO-FT.txt    | 72 +++++++++++++++++++++++++++--------------------------
 hw/net/virtio-net.c |  4 +++
 net/net.c           |  5 ++--
 net/socket.c        |  1 +
 4 files changed, 44 insertions(+), 38 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog