diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-27 16:23:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-27 16:23:08 +0100 |
| commit | 333ec4ca6a9f604331e2349cb91e9635f65d6462 (patch) | |
| tree | 25c382166f08458f94b614a3fc8b2668e3dd4c2a /contrib | |
| parent | 7cfdc02dae0d2ff58c897496cfdbbafc0eda0f3f (diff) | |
| parent | fa26f018393f18f5e91334820546bef07b133b88 (diff) | |
| download | qemu-333ec4ca6a9f604331e2349cb91e9635f65d6462.zip qemu-333ec4ca6a9f604331e2349cb91e9635f65d6462.tar.gz qemu-333ec4ca6a9f604331e2349cb91e9635f65d6462.tar.bz2 | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 27 Sep 2016 11:05:56 BST
# gpg: using RSA key 0xEF04965B398D6211
# 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: (27 commits)
imx_fec: fix error in qemu_send_packet argument
mcf_fec: fix error in qemu_send_packet argument
net: mcf: limit buffer descriptor count
e1000e: Fix EIAC register implementation
e1000e: Fix spurious RX TCP ACK interrupts
e1000e: Fix OTHER interrupts processing for MSI-X
e1000e: Fix PBACLR implementation
e1000e: Fix CTRL_EXT.EIAME behavior
e1000e: Flush receive queues on link up
e1000e: Flush all receive queues on receive enable
net: limit allocation in nc_sendv_compat
tap: Allow specifying a bridge
e1000: fix buliding complaint
docs: Add documentation for COLO-proxy
MAINTAINERS: add maintainer for COLO-proxy
filter-rewriter: rewrite tcp packet to keep secondary connection
filter-rewriter: track connection and parse packet
filter-rewriter: introduce filter-rewriter initialization
colo-compare: add TCP, UDP, ICMP packet comparison
colo-compare: introduce packet comparison thread
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions