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

Cross-merge networking fixes after downstream PR (net-6.19-rc9).

No adjacent changes, conflicts:

drivers/net/ethernet/spacemit/k1_emac.c
  3125fc1701694 ("net: spacemit: k1-emac: fix jumbo frame support")
  f66086798f91f ("net: spacemit: Remove broken flow control support")
https://lore.kernel.org/aYIysFIE9ooavWia@sirena.org.uk

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/adi/adin1110.c
Simple merge

diff --cc drivers/net/ethernet/google/gve/gve_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/google/gve/gve_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ptp.c
Simple merge

diff --cc drivers/net/ethernet/spacemit/k1_emac.c
index 40c9504b7444536c3ebed3aac4909efe48cfd5bb,b49c4708bf9eb10c96c966571e9d0ddc6b3ebee3..dab0772c5b9d412847cb7bcd946b41a4fb5c4cc5
--- 1/drivers/net/ethernet/spacemit/k1_emac.c
--- 2/drivers/net/ethernet/spacemit/k1_emac.c
+++ b/drivers/net/ethernet/spacemit/k1_emac.c
@@@ -193,7 -201,9 +194,7 @@@ static void emac_reset_hw(struct emac_p
  
  static void emac_init_hw(struct emac_priv *priv)
  {
-       u32 rxirq = 0, dma = 0;
 -      /* Destination address for 802.3x Ethernet flow control */
 -      u8 fc_dest_addr[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x01 };
+       u32 rxirq = 0, dma = 0, frame_sz;
  
        regmap_set_bits(priv->regmap_apmu,
                        priv->regmap_apmu_offset + APMU_EMAC_CTRL_REG,
@@@ -218,6 -228,21 +219,15 @@@
                DEFAULT_TX_THRESHOLD);
        emac_wr(priv, MAC_RECEIVE_PACKET_START_THRESHOLD, DEFAULT_RX_THRESHOLD);
  
 -      /* Configure flow control (enabled in emac_adjust_link() later) */
 -      emac_set_mac_addr_reg(priv, fc_dest_addr, MAC_FC_SOURCE_ADDRESS_HIGH);
 -      emac_wr(priv, MAC_FC_PAUSE_HIGH_THRESHOLD, DEFAULT_FC_FIFO_HIGH);
 -      emac_wr(priv, MAC_FC_HIGH_PAUSE_TIME, DEFAULT_FC_PAUSE_TIME);
 -      emac_wr(priv, MAC_FC_PAUSE_LOW_THRESHOLD, 0);
 -
+       /* Set maximum frame size and jabber size based on configured MTU,
+        * accounting for Ethernet header, double VLAN tags, and FCS.
+        */
+       frame_sz = priv->ndev->mtu + ETH_HLEN + 2 * VLAN_HLEN + ETH_FCS_LEN;
+ 
+       emac_wr(priv, MAC_MAXIMUM_FRAME_SIZE, frame_sz);
+       emac_wr(priv, MAC_TRANSMIT_JABBER_SIZE, frame_sz);
+       emac_wr(priv, MAC_RECEIVE_JABBER_SIZE, frame_sz);
+ 
        /* RX IRQ mitigation */
        rxirq = FIELD_PREP(MREGBIT_RECEIVE_IRQ_FRAME_COUNTER_MASK,
                           EMAC_RX_FRAMES);

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

diff --cc drivers/net/phy/sfp.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

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

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

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

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/core/gro.c
Simple merge

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

diff --cc net/ipv6/ip6_fib.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge