netdev - Re: net vs net-next conflicts while cross merging

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: <2bfbc6ec-0a25-4203-ad15-73a7864e2e04@redhat.com>
Date: Wed, 20 Nov 2024 09:45:23 +0100
From: Paolo Abeni <pabeni@...hat.com>
To: Jiawen Wu <jiawenwu@...stnetic.com>,
 'Russell King' <linux@...linux.org.uk>
Cc: netdev@...r.kernel.org
Subject: Re: net vs net-next conflicts while cross merging

On 11/20/24 09:28, Jiawen Wu wrote:
> On Tue, No 19, 2024 9:15 PM, Paolo Abeni wrote:
>> I just cross-merged net into net-next for the 6.13 PR. There was 2
>> conflicts:
>>
>> include/linux/phy.h
>> 41ffcd95015f net: phy: fix phylib's dual eee_enabled
>> 21aa69e708b net: phy: convert eee_broken_modes to a linkmode bitmap
>>
>> drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>> 2160428bcb20 net: txgbe: fix null pointer to pcs
>> 2160428bcb20 net: txgbe: remove GPIO interrupt controller
> 
> I don't find what's the conflict here. Do you mean these two:
> 
> 2160428bcb20 ("net: txgbe: fix null pointer to pcs")
> 155c499ffd1d ("net: wangxun: txgbe: use phylink_pcs internally")

Yep, the latter one.

> If this is the case, it should be resolved as follow:
> 
> static struct phylink_pcs *txgbe_phylink_mac_select(struct phylink_config *config,
> 						    phy_interface_t interface)
> {
> 	struct wx *wx = phylink_to_wx(config);
> 	struct txgbe *txgbe = wx->priv;
> 
> 	if (wx->media_type != sp_media_copper)
> 		return txgbe->pcs;
> 
> 	return NULL;
> }

Ok, so it looks like the current net-next code is correct.

Thanks,

Paolo