Subject: linux-next: manual merge of the net-next tree with the net tree

From: Mark Brown <[email-masked]>
Date: Tue, 3 Feb 2026 17:38:56 +0000

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/spacemit/k1_emac.c

between commit:

  3125fc1701694 ("net: spacemit: k1-emac: fix jumbo frame support")

from the net tree and commit:

  f66086798f91f ("net: spacemit: Remove broken flow control support")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/ethernet/spacemit/k1_emac.c
index b49c4708bf9eb,40c9504b74445..0000000000000
--- a/drivers/net/ethernet/spacemit/k1_emac.c
+++ b/drivers/net/ethernet/spacemit/k1_emac.c
@@@ -201,9 -193,7 +194,7 @@@ static void emac_reset_hw(struct emac_p
  
  static void emac_init_hw(struct emac_priv *priv)
  {
- 	/* 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;
 +	u32 rxirq = 0, dma = 0, frame_sz;
  
  	regmap_set_bits(priv->regmap_apmu,
  			priv->regmap_apmu_offset + APMU_EMAC_CTRL_REG,
@@@ -228,21 -218,6 +219,15 @@@
  		DEFAULT_TX_THRESHOLD);
  	emac_wr(priv, MAC_RECEIVE_PACKET_START_THRESHOLD, DEFAULT_RX_THRESHOLD);
  
 +	/* 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);
 +
- 	/* 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);
- 
  	/* RX IRQ mitigation */
  	rxirq = FIELD_PREP(MREGBIT_RECEIVE_IRQ_FRAME_COUNTER_MASK,
  			   EMAC_RX_FRAMES);