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

[Mark Brown]

Hi all,

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

  drivers/net/ethernet/realtek/r8169_main.c

between commit:

  3cdeaef1754ab ("r8169: disable EEE on RTL8168h/8111h")

from the net tree and commit:

  8a3c76523e449 ("r8169: add support for phylink")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/ethernet/realtek/r8169_main.c
index ee1bc9bd04470,1d06ddff98327..0000000000000
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@@ -5474,22 -5619,6 +5619,12 @@@ static int r8169_mdio_register(struct r
  		return -EUNATCH;
  	}
  
- 	tp->phydev->mac_managed_pm = true;
- 	if (rtl_supports_eee(tp))
- 		phy_support_eee(tp->phydev);
- 	phy_support_asym_pause(tp->phydev);
- 
- 	/* mimic behavior of r8125/r8126 vendor drivers */
- 	if (tp->mac_version == RTL_GIGA_MAC_VER_61)
- 		phy_disable_eee_mode(tp->phydev,
- 				     ETHTOOL_LINK_MODE_2500baseT_Full_BIT);
- 
 +	/* Keep EEE off but the version stays EEE-capable so that link-up
 +	 * still clears the MAC TX-LPI bits.
 +	 */
 +	if (tp->mac_version == RTL_GIGA_MAC_VER_46)
 +		phy_disable_eee(tp->phydev);
 +
  	/* PHY will be woken up in rtl_open() */
  	phy_suspend(tp->phydev);

Attachment: signature.asc
Description: PGP signature