Merge git://git.kernel.org/pub/scm/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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mt7530.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
Simple merge

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/fw/dbg.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/d3.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
Simple merge

diff --cc net/ethtool/cabletest.c
index d4a79310b33f74d085c9986db970a33c1e47e3e7,84096f6b0236e8675a5278a79f3c9e2d5602ab88..ddcba073321f0ed4a88647659c0dda54c4f14ee6
--- 1/net/ethtool/cabletest.c
--- 2/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();
-       phydev = ethnl_req_get_phydev(&req_info,
-                                     tb[ETHTOOL_A_CABLE_TEST_HEADER],
 +      netdev_lock_ops(dev);
+       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();
-       phydev = ethnl_req_get_phydev(&req_info,
-                                     tb[ETHTOOL_A_CABLE_TEST_TDR_HEADER],
 +      netdev_lock_ops(dev);
+       phydev = ethnl_req_get_phydev(&req_info, tb,
+                                     ETHTOOL_A_CABLE_TEST_TDR_HEADER,
                                      info->extack);
        if (IS_ERR_OR_NULL(phydev)) {
                ret = -EOPNOTSUPP;

diff --cc net/ethtool/netlink.c
Simple merge

diff --cc net/ethtool/phy.c
Simple merge

diff --cc net/ipv4/tcp_offload.c
Simple merge

diff --cc net/ipv4/udp_offload.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/mptcp/pm_netlink.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge