From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 6 Mar 2025 21:01:27 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: io_uring-6.15-20250403~82^2~165
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2525e16a2bae322641fd745412f3524d4455d8df;p=linux-block.git

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.14-rc6).

Conflicts:

net/ethtool/cabletest.c
  2bcf4772e45a ("net: ethtool: try to protect all callback with netdev instance lock")
  637399bf7e77 ("net: ethtool: netlink: Allow NULL nlattrs when getting a phy_device")

No Adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

2525e16a2bae322641fd745412f3524d4455d8df
diff --cc net/ethtool/cabletest.c
index d4a79310b33f,84096f6b0236..ddcba073321f
--- a/net/ethtool/cabletest.c
+++ b/net/ethtool/cabletest.c
@@@ -72,9 -72,8 +72,9 @@@ int ethnl_act_cable_test(struct sk_buf
  	dev = req_info.dev;
  
  	rtnl_lock();
 +	netdev_lock_ops(dev);
- 	phydev = ethnl_req_get_phydev(&req_info,
- 				      tb[ETHTOOL_A_CABLE_TEST_HEADER],
+ 	phydev = ethnl_req_get_phydev(&req_info, tb,
+ 				      ETHTOOL_A_CABLE_TEST_HEADER,
  				      info->extack);
  	if (IS_ERR_OR_NULL(phydev)) {
  		ret = -EOPNOTSUPP;
@@@ -341,9 -339,8 +341,9 @@@ int ethnl_act_cable_test_tdr(struct sk_
  		goto out_dev_put;
  
  	rtnl_lock();
 +	netdev_lock_ops(dev);
- 	phydev = ethnl_req_get_phydev(&req_info,
- 				      tb[ETHTOOL_A_CABLE_TEST_TDR_HEADER],
+ 	phydev = ethnl_req_get_phydev(&req_info, tb,
+ 				      ETHTOOL_A_CABLE_TEST_TDR_HEADER,
  				      info->extack);
  	if (IS_ERR_OR_NULL(phydev)) {
  		ret = -EOPNOTSUPP;