]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 4 Jun 2021 12:38:48 +0000 (13:38 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 4 Jun 2021 12:38:49 +0000 (13:38 +0100)
# gpg: Signature made Fri 04 Jun 2021 08:26:16 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:
  MAINTAINERS: Added eBPF maintainers information.
  docs: Added eBPF documentation.
  virtio-net: Added eBPF RSS to virtio-net.
  ebpf: Added eBPF RSS loader.
  ebpf: Added eBPF RSS program.
  net: Added SetSteeringEBPF method for NetClientState.
  net/tap: Added TUNSETSTEERINGEBPF code.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
MAINTAINERS
configure
hw/net/virtio-net.c
meson.build
net/tap-bsd.c

diff --cc MAINTAINERS
Simple merge
diff --cc configure
Simple merge
Simple merge
diff --cc meson.build
Simple merge
diff --cc net/tap-bsd.c
Simple merge