Commit 502cc061 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/phy_device.c
  2560db6e ("net: phy: Fix missing of_node_put() for leds")
  1dce520a ("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
  858430db ("net: xilinx: axienet: Fix race in axienet_stop")
  76abb5d6 ("net: xilinx: axienet: Add statistics support")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e10034e3 d759ee24
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment