]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 8 May 2025 15:56:12 +0000 (08:56 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 May 2025 15:59:02 +0000 (08:59 -0700)
Cross-merge networking fixes after downstream PR (net-6.15-rc6).

No conflicts.

Adjacent changes:

net/core/dev.c:
  08e9f2d584c4 ("net: Lock netdevices during dev_shutdown")
  a82dc19db136 ("net: avoid potential race between netdev_get_by_index_lock() and netns switch")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
16 files changed:
1  2 
Documentation/devicetree/bindings/net/ethernet-controller.yaml
MAINTAINERS
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/meta/fbnic/fbnic.h
drivers/net/ethernet/meta/fbnic/fbnic_csr.h
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
drivers/net/ethernet/meta/fbnic/fbnic_pci.c
drivers/net/ethernet/ti/icssg/icssg_common.c
include/linux/ieee80211.h
include/linux/netdevice.h
include/net/netdev_queues.h
net/core/dev.c
net/core/netdev-genl.c
net/ipv6/addrconf.c
net/mac80211/mlme.c
tools/net/ynl/lib/ynl.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge