Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

No conflicts, adjacent changes in:

drivers/net/phy/micrel.c
  96a9178a29a6 ("net: phy: micrel: lan8814 fix reset of the QSGMII interface")
  61b7ade9ba8c ("net: phy: micrel: Add support for non PTP SKUs for lan8814")

and a trivial one in tools/testing/selftests/drivers/net/Makefile.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/phy/micrel.c
index d167a58924f7902c72983699fc3d99789c97a1a9,01c87c9b77020eaf5bceab07c10b2ffb70e56bf3..57ea947369fedef8a06fe22b1c3c0367b6d41363
--- 1/drivers/net/phy/micrel.c
--- 2/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@@ -4592,19 -4464,13 +4586,25 @@@ static int lan8814_probe(struct phy_dev
        devm_phy_package_join(&phydev->mdio.dev, phydev,
                              addr, sizeof(struct lan8814_shared_priv));
  
 +      /* There are lan8814 SKUs that don't support PTP. Make sure that for
 +       * those skus no PTP device is created. Here we check if the SKU
 +       * supports PTP.
 +       */
 +      err = lanphy_read_page_reg(phydev, LAN8814_PAGE_COMMON_REGS,
 +                                 LAN8814_SKUS);
 +      if (err < 0)
 +              return err;
 +
 +      priv->is_ptp_available = err == LAN8814_REV_LAN8814 ||
 +                               err == LAN8814_REV_LAN8818;
 +
        if (phy_package_init_once(phydev)) {
+               /* Reset the PHY */
+               lanphy_modify_page_reg(phydev, LAN8814_PAGE_COMMON_REGS,
+                                      LAN8814_QSGMII_SOFT_RESET,
+                                      LAN8814_QSGMII_SOFT_RESET_BIT,
+                                      LAN8814_QSGMII_SOFT_RESET_BIT);
+ 
                err = lan8814_release_coma_mode(phydev);
                if (err)
                        return err;

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/net/wireless/ath/ath11k/wmi.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mld/link.c
Simple merge

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

diff --cc drivers/net/wireless/virtual/mac80211_hwsim.c
Simple merge

diff --cc fs/smb/server/transport_tcp.c
Simple merge

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

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

diff --cc net/sched/sch_generic.c
Simple merge

diff --cc net/strparser/strparser.c
Simple merge

diff --cc tools/testing/selftests/drivers/net/Makefile
Simple merge

diff --cc tools/testing/selftests/net/mptcp/mptcp_connect.c
Simple merge

diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
Simple merge