Hi all,

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

  include/linux/phy.h

between commit:

  41ffcd95015f ("net: phy: fix phylib's dual eee_enabled")

from the net tree and commit:

  721aa69e708b ("net: phy: convert eee_broken_modes to a linkmode bitmap")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/phy.h
index 44890cdf40a2,b8346db42727..000000000000
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@@ -720,6 -721,11 +720,10 @@@ struct phy_device 
  	/* used for eee validation and configuration*/
  	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported_eee);
  	__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising_eee);
+ 	/* Energy efficient ethernet modes which should be prohibited */
+ 	__ETHTOOL_DECLARE_LINK_MODE_MASK(eee_broken_modes);
 -	bool eee_enabled;
+ 	bool enable_tx_lpi;
+ 	struct eee_config eee_cfg;
  
  	/* Host supported PHY interface types. Should be ignored if empty. */
  	DECLARE_PHY_INTERFACE_MASK(host_interfaces);