Cross-merge networking fixes after downstream PR (net-6.14-rc6). Conflicts: net/ethtool/cabletest.c 2bcf4772 ("net: ethtool: try to protect all callback with netdev instance lock") 637399bf ("net: ethtool: netlink: Allow NULL nlattrs when getting a phy_device") No Adjacent changes. Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Loading
Please sign in to comment