diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2021-08-02 09:47:07 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2021-08-02 09:47:07 +0100 |
commit | 10a3c4a4b3e14208cfed274514d1911e5230935f (patch) | |
tree | 39948d70550c5fcc4945a0a0a4e9e6da13731c96 /scripts/clean-header-guards.pl | |
parent | 0c633cf0c221922a0a9f9d0b8866cbb111f5e192 (diff) | |
parent | cfe6d6841ff46b43ec38792422f690813f4ce3bf (diff) | |
download | qemu-10a3c4a4b3e14208cfed274514d1911e5230935f.zip qemu-10a3c4a4b3e14208cfed274514d1911e5230935f.tar.gz qemu-10a3c4a4b3e14208cfed274514d1911e5230935f.tar.bz2 |
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) <jasowang@redhat.com>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/clean-header-guards.pl')
0 files changed, 0 insertions, 0 deletions