Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
	drivers/net/ethernet/octeon/octeon_mgmt.c

diff --cc drivers/net/ethernet/octeon/octeon_mgmt.c
index a688a2ddcfd612866edbce5f8ee08b7f92fbd8e0,5be431c25147d83fa03875dc5d7f47aca396bae2..f97719c48516a037db795c9ee0879c526a062037
--- 1/drivers/net/ethernet/octeon/octeon_mgmt.c
--- 2/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@@ -722,10 -973,8 +973,8 @@@ static int octeon_mgmt_init_phy(struct 
                                   octeon_mgmt_adjust_link, 0,
                                   PHY_INTERFACE_MODE_MII);
  
 -      if (p->phydev == NULL)
 +      if (!p->phydev)
-               return -1;
- 
-       phy_start_aneg(p->phydev);
+               return -ENODEV;
  
        return 0;
  }