From: David S. Miller <davem@davemloft.net>
Date: Thu, 13 Aug 2015 23:23:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=182ad468e70fc7e8ff2e5d64344c690beaa00ddd;p=linux.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

182ad468e70fc7e8ff2e5d64344c690beaa00ddd
diff --cc drivers/net/ethernet/cavium/Kconfig
index 3584420878782,02e23e6f14248..9b35d142f47ac
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@@ -36,9 -34,6 +34,8 @@@ config THUNDER_NIC_V
  config	THUNDER_NIC_BGX
  	tristate "Thunder MAC interface driver (BGX)"
  	depends on 64BIT
- 	default ARCH_THUNDER
 +	select PHYLIB
 +	select MDIO_OCTEON
  	---help---
  	  This driver supports programming and controlling of MAC
  	  interface from NIC physical function driver.