diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-09-05 20:27:09 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-09-05 20:37:20 -0700 |
| commit | 502cc061de6692a9a8ca9bcf486de78e2664e869 (patch) | |
| tree | 16a6c1b6c40936c59bd6dee4c1de918789094ee0 /net/core | |
| parent | e10034e38e9da2a644f2aa73f2f46bb7beb8620b (diff) | |
| parent | d759ee240d3c0c4a19f4d984eb21c36da76bc6ce (diff) | |
Merge git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/net-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 146a271a74e0..0648dbf0e234 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1528,7 +1528,7 @@ static const struct attribute_group dql_group = { }; #else /* Fake declaration, all the code using it should be dead */ -extern const struct attribute_group dql_group; +static const struct attribute_group dql_group = {}; #endif /* CONFIG_BQL */ #ifdef CONFIG_XPS |