From mboxrd@z Thu Jan 1 00:00:00 1970 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 729A92D8DC2; Thu, 12 Mar 2026 12:52:39 +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=1773319959; cv=none; b=aakc8qiZAGWXLeWipLdjbFBAN1KY1ZXRWS73zK3BztbyfOn36/z9Al9wXxpb36Cy8GtiRl14oHvkJUdfyT6ExIcD3+d0m/15oNxxCb6+zORvc17NzAMyepsGFhMAvg9CIX4f8vhzLkHlHuuiiQigVxvA+Vv0GCUpqWdyBk0Rwhk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773319959; c=relaxed/simple; bh=XU3qMOLHx5LF82p/dzJ0X7DRVsKLx2VKAUG2jpRhIbw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=FRHmnmVojGQ4l3kLe9aqwGFkHvkSb5jIV7gVXxM7XvL3AtLcNDS45EH+VPko6maN4nMTTu+VB3Bpn2/QgwtKtpiR8MS76fRVgufaITvxw9+YwNw/w8Zc0etNwE5UvwQdMSZNFnuMOxiqKJN/IHxBJG9hsEhLbYGJsn3Acri/MnU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TSaWi2gP; 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="TSaWi2gP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EAEAC4CEF7; Thu, 12 Mar 2026 12:52:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773319959; bh=XU3qMOLHx5LF82p/dzJ0X7DRVsKLx2VKAUG2jpRhIbw=; h=Date:From:To:Cc:Subject:From; b=TSaWi2gPT0Fw5brUD+oEH/XSmmorUTSfBFou+F4EFlOtupQndlTy/pIvo0ps4BORl I5p6AuL8lhTH9v2GkNQNLBx0egM2sRL0pLp/jxfH8YwhHGRKyU4Z1YcGWmggLbjMhE Xd8uIL1eTOBAuCI/Zd3AonJInZZN5wALOpLy+YouIu5gkZ9DhyHaimn8WnOMvlAwpD 7TzE7WJAhr8eX163NhgyIBWNKQwXMJW55t6z6YbS1K2tG27PjMY5A2R2z/3WZWsNbY PIKGmR4ImAGLQxl/AbR293U6MjL8OZPN37YMFiXHyZPVagCCMbBr1xiMZ25l6yehIf /MKax7YF1U45g== Date: Thu, 12 Mar 2026 12:52:34 +0000 From: Mark Brown To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Chintan Vankar , Linux Kernel Mailing List , Linux Next Mailing List , Sebastian Andrzej Siewior Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: Precedence: bulk X-Mailing-List: netdev@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="BKOKz4LaxThvnM+6" Content-Disposition: inline --BKOKz4LaxThvnM+6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/ti/am65-cpsw-nuss.c between commit: 840c9d13cb1ca ("net: ethernet: ti: am65-cpsw-nuss: Fix rx_filter value fo= r PTP support") =66rom the net tree and commit: a23c657e332f2 ("net: ethernet: ti: am65-cpsw: Use also port number to ide= ntify timestamps") =66rom 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/ti/am65-cpsw-nuss.c index 265ce5479915f,a38bf7f4f4343..0000000000000 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@@ -1351,8 -1351,8 +1351,8 @@@ static int am65_cpsw_nuss_rx_packets(st ndev_priv =3D netdev_priv(ndev); am65_cpsw_nuss_set_offload_fwd_mark(skb, ndev_priv->offload_fwd_mark); skb_put(skb, pkt_len); - if (port->rx_ts_enabled) + if (port->rx_ts_filter) - am65_cpts_rx_timestamp(common->cpts, skb); + am65_cpts_rx_timestamp(common->cpts, port_id, skb); skb_mark_for_recycle(skb); skb->protocol =3D eth_type_trans(skb, ndev); am65_cpsw_nuss_rx_csum(skb, csum_info); --BKOKz4LaxThvnM+6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmmytxEACgkQJNaLcl1U h9Ce4Qf/QPfy8FS3+1+khTB0KrNCnmKU0ylwfvhaX1tdznGj4KU/CepWn/xjjYUa 3k7nVtTP12SbqEUMTgTcT/j2SOhj/C7SfBJBMSBZIm1mjihgSffHLEC6uwHKDmM8 bqWjgG2q9REu7yNPGKD2CKNOLhXVaocMADhD9azPeOCleclRo6tWaZ45BIwKIpKh n2a8XMlr7AmbAiumB00gkWVyWMHDrOjf9l3dZeHCOqGOBCI2t/m/LaLgjWbGEr7J I4CpZQ8TaTJjdHGo1cCM0hXvMhDxKIaG9cVdurRbp2IbW+PzqBQkIfXc9A+QbJQA u8/vuVFbucpZrxZ92/RFQsUva6SPCA== =122z -----END PGP SIGNATURE----- --BKOKz4LaxThvnM+6--