Skip to content
Commit 56794e53 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net



Cross-merge networking fixes after downstream PR.

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
  23c93c3b ("bnxt_en: do not map packet buffers twice")
  6d1add95 ("bnxt_en: Modify TX ring indexing logic.")

tools/testing/selftests/net/Makefile
  2258b666 ("selftests: add vlan hw filter tests")
  a0bc96c0 ("selftests: net: verify fq per-band packet limit")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 5a78a812 7c5e046b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment