From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Vinod Koul <vkoul@kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the net-next tree
Date: Tue, 22 Mar 2022 09:53:22 +0100 [thread overview]
Message-ID: <CAMuHMdVJjhd77PtV6SA0iFXznkH0X82iJTg5akaud7ZkMvRvkA@mail.gmail.com> (raw)
In-Reply-To: <20220315164531.6c1b626b@canb.auug.org.au>
Hi Stephen,
On Tue, Mar 15, 2022 at 6:45 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
> --- 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
The above resolution is not correct: Layerscape is a different SoC
family than i.MX8, using ARCH_LAYERSCAPE instead of ARCH_MXC.
Hence PHY_FSL_LYNX_28G should be moved outside the if/endif block
(and gain a dependency on ARCH_LAYERSCAPE || COMPILE_TEST; I will
send a patch).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2022-03-22 8:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 5:45 linux-next: manual merge of the char-misc tree with the net-next tree Stephen Rothwell
2022-03-15 7:35 ` Greg KH
2022-03-22 8:53 ` Geert Uytterhoeven [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-12-20 6:02 Stephen Rothwell
2018-12-20 6:32 ` Greg KH
2016-09-05 6:56 Stephen Rothwell
2016-09-05 11:33 ` Greg KH
2016-09-06 5:36 ` KY Srinivasan
2016-09-06 10:28 ` KY Srinivasan
[not found] ` <BLUPR0301MB209827200D789C51EC56DA41CCF90@BLUPR0301MB2098.namprd03.prod.outlook.com>
2016-09-07 6:47 ` Greg KH
[not found] ` <BY2PR0301MB2104C50A152139E94BC3E442CCF80@BY2PR0301MB2104.namprd03.prod.outlook.com>
2016-09-08 10:21 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMuHMdVJjhd77PtV6SA0iFXznkH0X82iJTg5akaud7ZkMvRvkA@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=geert+renesas@glider.be \
--cc=greg@kroah.com \
--cc=ioana.ciornei@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).