From: Peter Maydell Date: Wed, 30 Mar 2016 11:30:38 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Tag: v2.7.1~433 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8850dcbfd7664fab86ab49d9c27b6fa700d71618;p=mirror_qemu.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Wed 30 Mar 2016 02:07:15 BST using RSA key ID 398D6211 # 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: Revert "e1000: fix hang of win2k12 shutdown with flood ping" e1000: Fixing interrupts pace. tests/test-filter-redirector: Add unit test for filter-redirector net/filter-mirror: implement filter-redirector net/filter-mirror: Change filter_mirror_send interface tests/test-filter-mirror:add filter-mirror unit test net/filter-mirror:Add filter-mirror Signed-off-by: Peter Maydell --- 8850dcbfd7664fab86ab49d9c27b6fa700d71618