diff mbox series

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

Message ID 20200928124608.2f527504@canb.auug.org.au
State New
Headers show
Series linux-next: manual merge of the net-next tree with the net tree | expand

Commit Message

Stephen Rothwell Sept. 28, 2020, 2:46 a.m. UTC
Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/phy/Kconfig

between commit:

  7dbbcf496f2a ("mdio: fix mdio-thunder.c dependency & build error")

from the net tree and commit:

  a9770eac511a ("net: mdio: Move MDIO drivers into a new subdirectory")

from the net-next tree.

I fixed it up (I used the latter and applied the following patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Sep 2020 12:42:10 +1000
Subject: [PATCH] merge fix for "mdio: fix mdio-thunder.c dependency & build error"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/mdio/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Andrew Lunn Sept. 28, 2020, 12:37 p.m. UTC | #1
> From: Stephen Rothwell <sfr@canb.auug.org.au>

> Date: Mon, 28 Sep 2020 12:42:10 +1000

> Subject: [PATCH] merge fix for "mdio: fix mdio-thunder.c dependency & build error"

> 

> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

> ---

>  drivers/net/mdio/Kconfig | 1 +

>  1 file changed, 1 insertion(+)

> 

> diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig

> index 840727cc9499..27a2a4a3d943 100644

> --- a/drivers/net/mdio/Kconfig

> +++ b/drivers/net/mdio/Kconfig

> @@ -164,6 +164,7 @@ config MDIO_THUNDER

>  	depends on 64BIT

>  	depends on PCI

>  	select MDIO_CAVIUM

> +	select MDIO_DEVRES

>  	help

>  	  This driver supports the MDIO interfaces found on Cavium

>  	  ThunderX SoCs when the MDIO bus device appears as a PCI

> -- 

> 2.28.0


Reviewed-by: Andrew Lunn <andrew@lunn.ch>


    Andrew
diff mbox series

Patch

diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig
index 840727cc9499..27a2a4a3d943 100644
--- a/drivers/net/mdio/Kconfig
+++ b/drivers/net/mdio/Kconfig
@@ -164,6 +164,7 @@  config MDIO_THUNDER
 	depends on 64BIT
 	depends on PCI
 	select MDIO_CAVIUM
+	select MDIO_DEVRES
 	help
 	  This driver supports the MDIO interfaces found on Cavium
 	  ThunderX SoCs when the MDIO bus device appears as a PCI