linux-kernel - Re: linux-next: manual merge of the char-misc tree with the net-next 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <YjBBpnDBXLzuFPuI@kroah.com>
Date:   Tue, 15 Mar 2022 08:35:02 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>, David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Geert Uytterhoeven <geert+renesas@...der.be>,
        Ioana Ciornei <ioana.ciornei@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Vinod Koul <vkoul@...nel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the net-next
 tree

On Tue, Mar 15, 2022 at 04:45:31PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/phy/freescale/Kconfig
> 
> between commit:
> 
>   8f73b37cf3fb ("phy: add support for the Layerscape SerDes 28G")
> 
> from the net-next tree and commit:
> 
>   3d565bd6fbbb ("phy: freescale: i.MX8 PHYs should depend on ARCH_MXC && ARM64")
> 
> from the char-misc tree.
> 
> I fixed it up (I think, 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 drivers/phy/freescale/Kconfig
> index 0e91cd99c36b,856cbec7057d..000000000000
> --- a/drivers/phy/freescale/Kconfig
> +++ b/drivers/phy/freescale/Kconfig
> @@@ -23,12 -26,4 +26,14 @@@ config PHY_FSL_IMX8M_PCI
>   	  Enable this to add support for the PCIE PHY as found on
>   	  i.MX8M family of SOCs.
>   
>  +config PHY_FSL_LYNX_28G
>  +	tristate "Freescale Layerscape Lynx 28G SerDes PHY support"
>  +	depends on OF
>  +	select GENERIC_PHY
>  +	help
>  +	  Enable this to add support for the Lynx SerDes 28G PHY as
>  +	  found on NXP's Layerscape platforms such as LX2160A.
>  +	  Used to change the protocol running on SerDes lanes at runtime.
>  +	  Only useful for a restricted set of Ethernet protocols.
> ++
> + endif



Looks good, thanks!