From nobody Sat Feb 7 13:46:00 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B342A4A35; Tue, 3 Feb 2026 17:39:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770140341; cv=none; b=h04EtVjHUkxQt1gV9lzO6CadTnWC6zVwCRj02puA4fbiy0ox3R8xnBBczn3LPYtLRYeOVOetETGm3EJwu9uajA/8bhHdGdvUfxvjCg3s2KPMvfLRdv+IiOGzYhtTm5KIAVLwmFLCPzjFW0kDoJryCreky7zigp+OZ0n2C/Dyc1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770140341; c=relaxed/simple; bh=LsPMK9Gl0InO1O9IIX6oGTQbjGIWk74dRMibVKKXQIw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=gIRFqiivXb+ddooIwgmrr/RDXMsqhTig2CEeNm04u4KbLQXXzbgZpnWm/V3F0o8SFA+rjsmzySWSUJhgn92aqSs9QtpMVomuMxI2ZbAA9PAIEjesO3eO7s1fIt6obovesdhmkzn+KlwlkLl+hFAzspW2uhpqKMcL4p7zqMrBGmo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FwSNskwZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FwSNskwZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF1DBC19421; Tue, 3 Feb 2026 17:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770140341; bh=LsPMK9Gl0InO1O9IIX6oGTQbjGIWk74dRMibVKKXQIw=; h=Date:From:To:Cc:Subject:From; b=FwSNskwZ4hRTQjcsF/9ginUNfoZ6kPPr56DmBj95rOyYPZT+viNhb5oDYRYiNNXip sgYr2hZz4LE9MiNL1H2m2b8yswYtNaW+ZIjSP7/DuFGV/+3D3My7iVFXzeXCkTzQA4 VfQSPVnCHlnadgb3kv7htcVj+GUCrXFwvI2AramtVzhsQNR3fCLCVb2Dr9QAFjF+rm v6uu0WeOqEyw7JRXaKb+kuUirKRXGriO7mBwuDeVpE497YzuWsjMz1lledw1umG78o z5YV3kfEcox25VThVLlaG2S5L6qZWzGfeys6qjMZNaB2wMrJtUGHOggDnexOSLGtD5 DwMkafQQpMg6g== Date: Tue, 3 Feb 2026 17:38:56 +0000 From: Mark Brown To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List , Tomas Hlavacek , Vivian Wang Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="lkug/g3BTk7qqesV" Content-Disposition: inline --lkug/g3BTk7qqesV Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =20 static void emac_init_hw(struct emac_priv *priv) { - /* Destination address for 802.3x Ethernet flow control */ - u8 fc_dest_addr[ETH_ALEN] =3D { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x01 }; - u32 rxirq =3D 0, dma =3D 0; + u32 rxirq =3D 0, dma =3D 0, frame_sz; =20 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); =20 + /* Set maximum frame size and jabber size based on configured MTU, + * accounting for Ethernet header, double VLAN tags, and FCS. + */ + frame_sz =3D 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); -=20 /* RX IRQ mitigation */ rxirq =3D FIELD_PREP(MREGBIT_RECEIVE_IRQ_FRAME_COUNTER_MASK, EMAC_RX_FRAMES); --lkug/g3BTk7qqesV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmmCMrAACgkQJNaLcl1U h9Bvkgf/Vb8/B9F03SSUrMuREqVeo7lVL+iojs2fETc3dZ2310pYt7ZhvAJMSsmZ KXy/d5ziPfNn9/F89vt0PLDCPPcZ5dz9F0x8MH5weE62KC/OxY1F6zZslzQj/IOF ugt8qeLf5rVXJ3/zbCj5veAsOxnCNj8q+3litS5TQ0IYEH6bkFfvHYKGTWm7pjOo QjHnv7viY4o8d7XrtCYu+LRdpFTFNndEbu0ihXGEdPCyiHHCHJncs9pPpktWeGaW Nv6Lh9z88IkoM2zdroFzSMLNZiX/bO8tjzP5zmo7v/GA53pOH/XbOKqrpYCeYtr3 o6nwixOmlZtAmQj5c9N0Y7v9xqNgPQ== =C+SL -----END PGP SIGNATURE----- --lkug/g3BTk7qqesV--