Messages in this thread | | | Date | Mon, 1 Oct 2012 13:58:29 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the mips tree with Linus' tree |
| |
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in drivers/net/ethernet/octeon/octeon_mgmt.c between commit df555b665367 ("netdev: octeon: fix return value check in octeon_mgmt_init_phy()") from Linus' tree and commit eeae05aa2169 ("netdev: octeon_mgmt: Add support for 1Gig ports") from the mips tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/octeon/octeon_mgmt.c index a688a2d,5be431c..0000000 --- a/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; } [unhandled content-type:application/pgp-signature] | |