]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 26 Jul 2025 18:44:23 +0000 (11:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 26 Jul 2025 18:49:45 +0000 (11:49 -0700)
commitc58c18be8850d58fd61b0480d2355df89ce7ee59
treed0ef58fab37674a1b56fc0df0400898e58b60fd5
parentc471b90bb332dadd59744fb2c8407d67d815b6e6
parentafd8c2c9e2e29c6c7705635bea2960593976dacc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Merge in late fixes to prepare for the 6.17 net-next PR.

Conflicts:

net/core/neighbour.c
  1bbb76a89948 ("neighbour: Fix null-ptr-deref in neigh_flush_dev().")
  13a936bb99fb ("neighbour: Protect tbl->phash_buckets[] with a dedicated mutex.")
  03dc03fa0432 ("neighbor: Add NTF_EXT_VALIDATED flag for externally validated entries")

Adjacent changes:

drivers/net/usb/usbnet.c
  0d9cfc9b8cb1 ("net: usbnet: Avoid potential RCU stall on LINK_CHANGE event")
  2c04d279e857 ("net: usb: Convert tasklet API to new bottom half workqueue mechanism")

net/ipv6/route.c
  31d7d67ba127 ("ipv6: annotate data-races around rt->fib6_nsiblings")
  1caf27297215 ("ipv6: adopt dst_dev() helper")
  3b3ccf9ed05e ("net: Remove unnecessary NULL check for lwtunnel_fill_encap()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
12 files changed:
drivers/net/dsa/microchip/ksz8.c
drivers/net/dsa/microchip/ksz8_reg.h
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/micrel.c
drivers/net/usb/usbnet.c
include/linux/usb/usbnet.h
net/core/neighbour.c
net/ipv6/ip6_fib.c
net/ipv6/route.c
tools/testing/selftests/drivers/net/hw/tso.py