]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 9 Aug 2016 09:44:27 +0000 (10:44 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 9 Aug 2016 09:44:27 +0000 (10:44 +0100)
commitab861f3915e8667927cf18ad97f71cae7ccf8818
tree6b8917d16c174baeb34e5dd8ceec838cdaf2dca2
parent53279c76cf071fed07a336948d37c72e3613e0b7
parenta0d1cbdacff5df4ded16b753b38fdd9da6092968
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

# gpg: Signature made Tue 09 Aug 2016 08:28:39 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:
  hw/net: Fix a heap overflow in xlnx.xps-ethernetlite
  net: vmxnet3: check for device_active before write
  net: check fragment length during fragmentation

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>