Conflicts:
	drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>