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

[Stephen Rothwell]

Hi all,

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

  drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
  drivers/net/ethernet/huawei/hinic/hinic_main.c

between commit:

  e8a1b0efd632 ("hinic: fix a bug of ndo_stop")

from the net tree and commit:

  7dd29ee12865 ("hinic: add sriov feature support")

from the net-next tree.

I fixed it up (I think, 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 drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
index 992908e6eebf,eef855f11a01..000000000000
--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
@@@ -358,12 -353,13 +358,16 @@@ int hinic_msg_to_mgmt(struct hinic_pf_t
  		return -EINVAL;
  	}
  
 +	if (cmd == HINIC_PORT_CMD_SET_FUNC_STATE)
 +		timeout = SET_FUNC_PORT_MGMT_TIMEOUT;
 +
- 	return msg_to_mgmt_sync(pf_to_mgmt, mod, cmd, buf_in, in_size,
+ 	if (HINIC_IS_VF(hwif))
+ 		return hinic_mbox_to_pf(pf_to_mgmt->hwdev, mod, cmd, buf_in,
+ 					in_size, buf_out, out_size, 0);
+ 	else
+ 		return msg_to_mgmt_sync(pf_to_mgmt, mod, cmd, buf_in, in_size,
  				buf_out, out_size, MGMT_DIRECT_SEND,
 -				MSG_NOT_RESP);
 +				MSG_NOT_RESP, timeout);
  }
  
  /**
diff --cc drivers/net/ethernet/huawei/hinic/hinic_main.c
index 63b92f6cc856,3d6569d7bac8..000000000000
--- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
@@@ -496,9 -501,23 +500,12 @@@ static int hinic_close(struct net_devic
  
  	up(&nic_dev->mgmt_lock);
  
+ 	if (!HINIC_IS_VF(nic_dev->hwdev->hwif))
+ 		hinic_notify_all_vfs_link_changed(nic_dev->hwdev, 0);
+ 
 -	err = hinic_port_set_func_state(nic_dev, HINIC_FUNC_PORT_DISABLE);
 -	if (err) {
 -		netif_err(nic_dev, drv, netdev,
 -			  "Failed to set func port state\n");
 -		nic_dev->flags |= (flags & HINIC_INTF_UP);
 -		return err;
 -	}
 +	hinic_port_set_state(nic_dev, HINIC_PORT_DISABLE);
  
 -	err = hinic_port_set_state(nic_dev, HINIC_PORT_DISABLE);
 -	if (err) {
 -		netif_err(nic_dev, drv, netdev, "Failed to set port state\n");
 -		nic_dev->flags |= (flags & HINIC_INTF_UP);
 -		return err;
 -	}
 +	hinic_port_set_func_state(nic_dev, HINIC_FUNC_PORT_DISABLE);
  
  	if (nic_dev->flags & HINIC_RSS_ENABLE) {
  		hinic_rss_deinit(nic_dev);

Attachment: pgp5EPo9hOMoo.pgp
Description: OpenPGP digital signature