linux-kernel - Re: linux-next: manual merge of the net-next tree with the net tree

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: <ZMfVyT1QEFad1iOn@shell.armlinux.org.uk>
Date:   Mon, 31 Jul 2023 16:39:53 +0100
From:   "Russell King (Oracle)" <linux@...linux.org.uk>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Miller <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Networking <netdev@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

On Mon, Jul 31, 2023 at 10:22:54AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   net/dsa/port.c
> 
> between commit:
> 
>   9945c1fb03a3 ("net: dsa: fix older DSA drivers using phylink")
> 
> from the net tree and commit:
> 
>   a88dd7538461 ("net: dsa: remove legacy_pre_march2020 detection")
> 
> 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc net/dsa/port.c
> index 2f6195d7b741,c63cbfbe6489..000000000000
> --- a/net/dsa/port.c
> +++ b/net/dsa/port.c
> @@@ -1720,22 -1686,8 +1686,15 @@@ int dsa_port_phylink_create(struct dsa_
>   	if (err)
>   		mode = PHY_INTERFACE_MODE_NA;
>   
> - 	/* Presence of phylink_mac_link_state or phylink_mac_an_restart is
> - 	 * an indicator of a legacy phylink driver.
> - 	 */
> - 	if (ds->ops->phylink_mac_link_state ||
> - 	    ds->ops->phylink_mac_an_restart)
> - 		dp->pl_config.legacy_pre_march2020 = true;
> - 
>  -	if (ds->ops->phylink_get_caps)
>  +	if (ds->ops->phylink_get_caps) {
>   		ds->ops->phylink_get_caps(ds, dp->index, &dp->pl_config);
>  +	} else {
>  +		/* For legacy drivers */
>  +		__set_bit(PHY_INTERFACE_MODE_INTERNAL,
>  +			  dp->pl_config.supported_interfaces);
>  +		__set_bit(PHY_INTERFACE_MODE_GMII,
>  +			  dp->pl_config.supported_interfaces);
>  +	}
>   
>   	pl = phylink_create(&dp->pl_config, of_fwnode_handle(dp->dn),
>   			    mode, &dsa_port_phylink_mac_ops);

LGTM, thanks.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!