projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
46431fd
2c89c1b
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Thu, 8 May 2025 15:56:12 +0000
(08:56 -0700)
committer
Jakub 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
patch
|
diff1
|
diff2
|
blob
|
history
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mediatek/mtk_eth_soc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/meta/fbnic/fbnic.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/meta/fbnic/fbnic_csr.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/meta/fbnic/fbnic_pci.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/ti/icssg/icssg_common.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/ieee80211.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/netdevice.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/netdev_queues.h
patch
|
diff1
|
diff2
|
blob
|
history
net/core/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/netdev-genl.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/addrconf.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/mlme.c
patch
|
diff1
|
diff2
|
blob
|
history
tools/net/ynl/lib/ynl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/devicetree/bindings/net/ethernet-controller.yaml
Simple merge
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge
diff --cc
drivers/net/ethernet/meta/fbnic/fbnic.h
Simple merge
diff --cc
drivers/net/ethernet/meta/fbnic/fbnic_csr.h
Simple merge
diff --cc
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
Simple merge
diff --cc
drivers/net/ethernet/meta/fbnic/fbnic_pci.c
Simple merge
diff --cc
drivers/net/ethernet/ti/icssg/icssg_common.c
Simple merge
diff --cc
include/linux/ieee80211.h
Simple merge
diff --cc
include/linux/netdevice.h
Simple merge
diff --cc
include/net/netdev_queues.h
Simple merge
diff --cc
net/core/dev.c
Simple merge
diff --cc
net/core/netdev-genl.c
Simple merge
diff --cc
net/ipv6/addrconf.c
Simple merge
diff --cc
net/mac80211/mlme.c
Simple merge
diff --cc
tools/net/ynl/lib/ynl.c
Simple merge