Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging

# -----BEGIN PGP SIGNATURE-----
# Version: GnuPG v1
#
# iQEcBAABAgAGBQJkCvgFAAoJEO8Ells5jWIRHiUH/jhydpJHIqnAPxHQAwGtmyhb
# 9Z52UOzW5V6KxfZJ+bQ4RPFkS2UwcxmeadPHY4zvvJTVBLAgG3QVgP4igj8CXKCI
# xRnwMgTNeu655kZQ5P/elTwdBTCJFODk7Egg/bH3H1ZiUhXBhVRhK7q/wMgtlZkZ
# Kexo6txCK4d941RNzEh45ZaGhdELE+B+D7cRuQgBs/DXZtJpsyEzBbP8KYSMHuER
# AXfWo0YIBYj7X3ek9D6j0pbOkB61vqtYd7W6xV4iDrJCcFBIOspJbbBb1tGCHola
# AXo5/OhRmiQnp/c/HTbJIDbrj0sq/r7LxYK4zY1x7UPbewHS9R+wz+FfqSmoBF0=
# =056y
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 10 Mar 2023 09:27:33 GMT
# 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

* tag 'net-pull-request' of https://github.com/jasowang/qemu: (44 commits)
  ebpf: fix compatibility with libbpf 1.0+
  docs/system/devices/igb: Add igb documentation
  tests/avocado: Add igb test
  igb: Introduce qtest for igb device
  tests/qtest/libqos/e1000e: Export macreg functions
  tests/qtest/e1000e-test: Fabricate ethernet header
  Intrdocue igb device emulation
  e1000: Split header files
  pcie: Introduce pcie_sriov_num_vfs
  net/eth: Introduce EthL4HdrProto
  e1000e: Implement system clock
  net/eth: Report if headers are actually present
  e1000e: Count CRC in Tx statistics
  e1000: Count CRC in Tx statistics
  e1000e: Combine rx traces
  MAINTAINERS: Add e1000e test files
  MAINTAINERS: Add Akihiko Odaki as a e1000e reviewer
  e1000e: Do not assert when MSI-X is disabled later
  hw/net/net_tx_pkt: Check the payload length
  hw/net/net_tx_pkt: Implement TCP segmentation
  ...

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

diff --combined MAINTAINERS
index 2f2f4de7cc347de77e67aaa18b1f1890024d7e4b,564af9d63378e39964af2846c7330e0b997cc3b0..95c957d587d9192519f01b38247b6dc089c1226c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2236,14 -2236,27 +2236,27 @@@ F: docs/specs/rocker.tx
  
  e1000x
  M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
+ R: Akihiko Odaki <akihiko.odaki@daynix.com>
  S: Maintained
  F: hw/net/e1000x*
  
  e1000e
  M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
+ R: Akihiko Odaki <akihiko.odaki@daynix.com>
  S: Maintained
  F: hw/net/e1000e*
  F: tests/qtest/fuzz-e1000e-test.c
+ F: tests/qtest/e1000e-test.c
+ F: tests/qtest/libqos/e1000e.*
+ 
+ igb
+ M: Akihiko Odaki <akihiko.odaki@daynix.com>
+ S: Maintained
+ F: docs/system/devices/igb.rst
+ F: hw/net/igb*
+ F: tests/avocado/igb.py
+ F: tests/qtest/igb-test.c
+ F: tests/qtest/libqos/igb.c
  
  eepro100
  M: Stefan Weil <sw@weilnetz.de>
@@@ -2889,11 -2902,9 +2902,11 @@@ T: git https://gitlab.com/ehabkost/qemu
  
  Cryptodev Backends
  M: Gonglei <arei.gonglei@huawei.com>
 +M: zhenwei pi <pizhenwei@bytedance.com>
  S: Maintained
  F: include/sysemu/cryptodev*.h
  F: backends/cryptodev*.c
 +F: qapi/cryptodev.json
  
  Python library
  M: John Snow <jsnow@redhat.com>