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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c

between commit:

  3d7a3f2612d7 ("net/mlx5: Nack sync reset request when HotPlug is enabled")

from the net tree and commit:

  cecf44ea1a1f ("net/mlx5: Allow sync reset flow when BF MGT interface device is present")

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 drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
index c4e19d627da2,4b8cb120362b..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@@ -325,29 -325,25 +325,48 @@@ static void mlx5_fw_live_patch_event(st
  		mlx5_core_err(dev, "Failed to reload FW tracer\n");
  }
  
 +#if IS_ENABLED(CONFIG_HOTPLUG_PCI_PCIE)
 +static int mlx5_check_hotplug_interrupt(struct mlx5_core_dev *dev)
 +{
 +	struct pci_dev *bridge = dev->pdev->bus->self;
 +	u16 reg16;
 +	int err;
 +
 +	if (!bridge)
 +		return -EOPNOTSUPP;
 +
 +	err = pcie_capability_read_word(bridge, PCI_EXP_SLTCTL, &reg16);
 +	if (err)
 +		return err;
 +
 +	if ((reg16 & PCI_EXP_SLTCTL_HPIE) && (reg16 & PCI_EXP_SLTCTL_DLLSCE)) {
 +		mlx5_core_warn(dev, "FW reset is not supported as HotPlug is enabled\n");
 +		return -EOPNOTSUPP;
 +	}
 +
 +	return 0;
 +}
 +#endif
 +
+ static const struct pci_device_id mgt_ifc_device_ids[] = {
+ 	{ PCI_VDEVICE(MELLANOX, 0xc2d2) }, /* BlueField1 MGT interface device ID */
+ 	{ PCI_VDEVICE(MELLANOX, 0xc2d3) }, /* BlueField2 MGT interface device ID */
+ 	{ PCI_VDEVICE(MELLANOX, 0xc2d4) }, /* BlueField3-Lx MGT interface device ID */
+ 	{ PCI_VDEVICE(MELLANOX, 0xc2d5) }, /* BlueField3 MGT interface device ID */
+ 	{ PCI_VDEVICE(MELLANOX, 0xc2d6) }, /* BlueField4 MGT interface device ID */
+ };
+ 
+ static bool mlx5_is_mgt_ifc_pci_device(struct mlx5_core_dev *dev, u16 dev_id)
+ {
+ 	int i;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(mgt_ifc_device_ids); ++i)
+ 		if (mgt_ifc_device_ids[i].device == dev_id)
+ 			return true;
+ 
+ 	return false;
+ }
+ 
  static int mlx5_check_dev_ids(struct mlx5_core_dev *dev, u16 dev_id)
  {
  	struct pci_bus *bridge_bus = dev->pdev->bus;

Attachment: pgpNB6hTO3cNP.pgp
Description: OpenPGP digital signature