linux-next: manual merge of the char-misc tree with the net-next tree

[Stephen Rothwell]

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

Attachment: pgpTcFqeUfkbd.pgp
Description: OpenPGP digital signature