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

From: Stephen Rothwell
Date: Sun Aug 09 2015 - 21:24:46 EST

Hi all,

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


between commit:

22f54bf932a0 ("net: thunderx: remove effective "default y" from Kconfig if ARCH_THUNDER=y")

from the net tree and commit:

274b0b3984a9 ("net: thunderx: Select CONFIG_MDIO_OCTEON for ThunderX NIC")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/cavium/Kconfig
index 02e23e6f1424,358442087878..000000000000
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@@ -34,6 -36,9 +34,8 @@@ config THUNDER_NIC_V
tristate "Thunder MAC interface driver (BGX)"
depends on 64BIT
- default ARCH_THUNDER
+ select PHYLIB
+ select MDIO_OCTEON
This driver supports programming and controlling of MAC
interface from NIC physical function driver.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at