Commit bebd7b26 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR (net-6.15-rc7).

Conflicts:

tools/testing/selftests/drivers/net/hw/ncdevmem.c
  97c4e094 ("tests/ncdevmem: Fix double-free of queue array")
  2f1a805f ("selftests: ncdevmem: Implement devmem TCP TX")
https://lore.kernel.org/20250514122900.1e77d62d@canb.auug.org.au



Adjacent changes:

net/core/devmem.c
net/core/devmem.h
  0afc44d8 ("net: devmem: fix kernel panic when netlink socket close after module unload")
  bd618489 ("net: devmem: Implement TX path")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 21c608a8 ef935650
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment