]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 46431fd 2c89c1b)
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)
commit6b02fd7799fc8e1160c5783459d065ceeb4b7365
tree5a4190dbd2cc0bf6150c2da94824e2e04047a058tree
parent46431fd5224f7f3bab2823992ae1cf6f2700f1cecommit | diff
parent2c89c1b655c0b06823f4ee8b055140d8628fc4dacommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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:
Documentation/devicetree/bindings/net/ethernet-controller.yaml diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/meta/fbnic/fbnic.h diff1 | diff2 | blob | history
drivers/net/ethernet/meta/fbnic/fbnic_csr.h diff1 | diff2 | blob | history
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/meta/fbnic/fbnic_pci.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/icssg/icssg_common.c diff1 | diff2 | blob | history
include/linux/ieee80211.h diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/net/netdev_queues.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/netdev-genl.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
tools/net/ynl/lib/ynl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.