Hi all,

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

  drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c

between commit:

  f2df54ddbfb04a ("net: txgbe: distinguish module types by checking identifier")

from the net tree and commit:

  f67aead16e85f7 ("net: txgbe: rework service event handling")

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 --combined drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
index 8fc32df8e49a44,72712cee1ab834..00000000000000
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
@@@ -186,25 -186,21 +186,21 @@@ static void txgbe_get_mac_link(struct w
  		*speed = SPEED_UNKNOWN;
  }
  
- int txgbe_set_phy_link(struct wx *wx)
+ void txgbe_set_phy_link(struct wx *wx)
  {
  	int speed, autoneg, duplex, err;
  
  	txgbe_get_link_capabilities(wx, &speed, &autoneg, &duplex);
  
  	err = txgbe_set_phy_link_hostif(wx, speed, autoneg, duplex);
- 	if (err) {
+ 	if (err)
  		wx_err(wx, "Failed to setup link\n");
- 		return err;
- 	}
- 
- 	return 0;
  }
  
  static int txgbe_sfp_to_linkmodes(struct wx *wx, struct txgbe_sff_id *id)
  {
  	__ETHTOOL_DECLARE_LINK_MODE_MASK(modes) = { 0, };
 -	DECLARE_PHY_INTERFACE_MASK(interfaces);
 +	DECLARE_PHY_INTERFACE_MASK_ZERO(interfaces);
  	struct txgbe *txgbe = wx->priv;
  
  	if (id->cable_tech & TXGBE_SFF_DA_PASSIVE_CABLE) {
@@@ -271,7 -267,7 +267,7 @@@
  static int txgbe_qsfp_to_linkmodes(struct wx *wx, struct txgbe_sff_id *id)
  {
  	__ETHTOOL_DECLARE_LINK_MODE_MASK(modes) = { 0, };
 -	DECLARE_PHY_INTERFACE_MASK(interfaces);
 +	DECLARE_PHY_INTERFACE_MASK_ZERO(interfaces);
  	struct txgbe *txgbe = wx->priv;
  
  	if (id->transceiver_type & TXGBE_SFF_ETHERNET_40G_CR4) {
@@@ -335,7 -331,7 +331,7 @@@
  
  int txgbe_identify_module(struct wx *wx)
  {
 -	struct txgbe_hic_get_module_info buffer;
 +	struct txgbe_hic_get_module_info buffer = { 0 };
  	struct txgbe_sff_id *id;
  	int err = 0;
  	u32 mod_abs;
@@@ -357,16 -353,18 +353,16 @@@
  	}
  
  	id = &buffer.id;
 -	if (id->identifier != TXGBE_SFF_IDENTIFIER_SFP &&
 -	    id->identifier != TXGBE_SFF_IDENTIFIER_QSFP &&
 -	    id->identifier != TXGBE_SFF_IDENTIFIER_QSFP_PLUS &&
 -	    id->identifier != TXGBE_SFF_IDENTIFIER_QSFP28) {
 -		wx_err(wx, "Invalid module\n");
 -		return -EINVAL;
 -	}
 -
 -	if (id->transceiver_type == 0xFF)
 +	if (id->identifier == TXGBE_SFF_IDENTIFIER_SFP)
  		return txgbe_sfp_to_linkmodes(wx, id);
  
 -	return txgbe_qsfp_to_linkmodes(wx, id);
 +	if (id->identifier == TXGBE_SFF_IDENTIFIER_QSFP ||
 +	    id->identifier == TXGBE_SFF_IDENTIFIER_QSFP_PLUS ||
 +	    id->identifier == TXGBE_SFF_IDENTIFIER_QSFP28)
 +		return txgbe_qsfp_to_linkmodes(wx, id);
 +
 +	wx_err(wx, "Invalid module\n");
 +	return -EINVAL;
  }
  
  void txgbe_setup_link(struct wx *wx)
@@@ -519,6 -517,7 +515,7 @@@ int txgbe_phylink_init_aml(struct txgb
  	err = phylink_set_fixed_link(phylink, &state);
  	if (err) {
  		wx_err(wx, "Failed to set fixed link\n");
+ 		phylink_destroy(phylink);
  		return err;
  	}