Commit 941defce authored by Paolo Abeni's avatar Paolo Abeni
Browse files
Cross-merge networking fixes after downstream PR (net-6.14-rc6).

Conflicts:

tools/testing/selftests/drivers/net/ping.py
  75cc19c8 ("selftests: drv-net: add xdp cases for ping.py")
  de94e869 ("selftests: drv-net: store addresses in dict indexed by ipver")
https://lore.kernel.org/netdev/20250311115758.17a1d414@canb.auug.org.au/

net/core/devmem.c
  a70f891e ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()")
  1d22d306 ("net: drop rtnl_lock for queue_mgmt operations")
https://lore.kernel.org/netdev/20250313114929.43744df1@canb.auug.org.au/



Adjacent changes:

tools/testing/selftests/net/Makefile
  6f50175c ("selftests: Add IPv6 link-local address generation tests for GRE devices.")
  2e5584e0 ("selftests/net: expand cmsg_ipv6.sh with ipv4")

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  66195855 ("eth: bnxt: do not use BNXT_VNIC_NTUPLE unconditionally in queue restart logic")
  fe96d717 ("bnxt_en: Extend queue stop/start for TX rings")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 89d75c4c 4003c9e7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment