Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 6 Sep 2024 03:27:09 +0000 (20:27 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 6 Sep 2024 03:37:20 +0000 (20:37 -0700)
commit502cc061de6692a9a8ca9bcf486de78e2664e869
tree16a6c1b6c40936c59bd6dee4c1de918789094ee0
parente10034e38e9da2a644f2aa73f2f46bb7beb8620b
parentd759ee240d3c0c4a19f4d984eb21c36da76bc6ce
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/phy_device.c
  2560db6ede1a ("net: phy: Fix missing of_node_put() for leds")
  1dce520abd46 ("net: phy: Use for_each_available_child_of_node_scoped()")
https://lore.kernel.org/20240904115823.74333648@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/xilinx/xilinx_axienet.h
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
  858430db28a5 ("net: xilinx: axienet: Fix race in axienet_stop")
  76abb5d675c4 ("net: xilinx: axienet: Add statistics support")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
16 files changed:
MAINTAINERS
drivers/net/bareudp.c
drivers/net/can/kvaser_pciefd.c
drivers/net/dsa/vitesse-vsc73xx-core.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/microsoft/mana/mana_en.c
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/ethernet/xilinx/xilinx_axienet.h
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
drivers/net/phy/phy_device.c
drivers/net/wireless/ath/ath11k/core.h
drivers/net/wireless/ath/ath11k/mac.c
include/net/mana/mana.h
net/core/net-sysfs.c
rust/kernel/net/phy.rs
tools/testing/selftests/net/Makefile