From: Peter Maydell Date: Tue, 24 Nov 2020 10:59:12 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Tag: v5.2.0-rc3~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d536d9578ec3ac5029a70b8126cb84bb6f2124a4;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Tue 24 Nov 2020 02:41:01 GMT # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) " [marginal] # 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: net: Use correct default-path macro for downscript tap: fix a memory leak net: purge queued rx packets on queue deletion net: do not exit on "netdev_add help" monitor command hw/net/e1000e: advance desc_offset in case of null descriptor Signed-off-by: Peter Maydell --- d536d9578ec3ac5029a70b8126cb84bb6f2124a4