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 1bbb76a8 ("neighbour: Fix null-ptr-deref in neigh_flush_dev().") 13a936bb ("neighbour: Protect tbl->phash_buckets[] with a dedicated mutex.") 03dc03fa ("neighbor: Add NTF_EXT_VALIDATED flag for externally validated entries") Adjacent changes: drivers/net/usb/usbnet.c 0d9cfc9b ("net: usbnet: Avoid potential RCU stall on LINK_CHANGE event") 2c04d279 ("net: usb: Convert tasklet API to new bottom half workqueue mechanism") net/ipv6/route.c 31d7d67b ("ipv6: annotate data-races around rt->fib6_nsiblings") 1caf2729 ("ipv6: adopt dst_dev() helper") 3b3ccf9e ("net: Remove unnecessary NULL check for lwtunnel_fill_encap()") Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Loading
Please register or sign in to comment