netdev - Re: [PATCH net] net: txgbe: fix null pointer to pcs: manual merge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <da1638d6-8235-4857-8f49-91152718fd4b@kernel.org>
Date: Tue, 19 Nov 2024 10:14:21 +0100
From: Matthieu Baerts <matttbe@...nel.org>
To: Jiawen Wu <jiawenwu@...stnetic.com>
Cc: andrew+netdev@...n.ch, davem@...emloft.net, kuba@...nel.org,
 pabeni@...hat.com, mengyuanlou@...-swift.com, duanqiangwen@...-swift.com,
 Stephen Rothwell <sfr@...b.auug.org.au>, netdev@...r.kernel.org
Subject: Re: [PATCH net] net: txgbe: fix null pointer to pcs: manual merge

Hello,

On 15/11/2024 08:35, Jiawen Wu wrote:
> For 1000BASE-X or SGMII interface mode, the PCS also need to be selected.
> Only return null pointer when there is a copper NIC with external PHY.

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  2160428bcb20 ("net: txgbe: fix null pointer to pcs")

and this one from 'net-next':

  155c499ffd1d ("net: wangxun: txgbe: use phylink_pcs internally")

----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.

The conflict has been resolved on our side [1] and the resolution we
suggest is attached to this email. Please report any issues linked to
this conflict resolution as it might be used by others. If you worked on
the mentioned patches, don't hesitate to ACK this conflict resolution.
---------------------------

Regarding this conflict, it was simple to resolve it because the
conflict was in the context: so the modification from both sides can be
taken: the new 'if' condition from 'net', and the new 'return' statement
from 'net-next'.

Rerere cache is available in [2].

1: https://github.com/multipath-tcp/mptcp_net-next/commit/74e6371ac34a
2: https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/631a1

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

View attachment "74e6371ac34a567f241de4b57ccbbc1741b3255e.patch" of type "text/x-patch" (525 bytes)