From: Peter Maydell Date: Mon, 2 Aug 2021 08:47:07 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Tag: v6.1.0-rc2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10a3c4a4b3e14208cfed274514d1911e5230935f;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Mon 02 Aug 2021 05:23:19 BST # 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: hw/net: e1000e: Don't zero out the VLAN tag in the legacy RX descriptor hw/net: e1000e: Correct the initial value of VET register hw/net: e1000: Correct the initial value of VET register hw/net/can: sja1000 fix buff2frame_bas and buff2frame_pel when dlc is out of std CAN 8 bytes hw/net/vmxnet3: Do not abort QEMU if guest specified bad queue numbers Signed-off-by: Peter Maydell --- 10a3c4a4b3e14208cfed274514d1911e5230935f