Hi all,

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

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

between commit:

  5256a46bf538 ("net/mlx5: Introduce control IRQ request API")
  30c6afa735db ("net/mlx5: Move affinity assignment into irq_request")

from the net-next tree and commits:

  7451e9ea8e20 ("net/mlx5: Use irq_set_affinity_and_hint()")
  0422fe2666ae ("Merge branch 'linus' into irq/core, to fix conflict")

from the tip 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/mellanox/mlx5/core/pci_irq.c
index 90fec0649ef5,fd7a671eda33..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
@@@ -236,10 -244,6 +236,10 @@@ struct mlx5_irq *mlx5_irq_alloc(struct 
  		err = -ENOMEM;
  		goto err_cpumask;
  	}
 +	if (affinity) {
 +		cpumask_copy(irq->mask, affinity);
- 		irq_set_affinity_hint(irq->irqn, irq->mask);
++		irq_set_affinity_and_hint(irq->irqn, irq->mask);
 +	}
  	irq->pool = pool;
  	irq->refcount = 1;
  	irq->index = i;
@@@ -251,7 -255,6 +251,7 @@@
  	}
  	return irq;
  err_xa:
- 	irq_set_affinity_hint(irq->irqn, NULL);
++	irq_set_affinity_and_hint(irq->irqn, NULL);
  	free_cpumask_var(irq->mask);
  err_cpumask:
  	free_irq(irq->irqn, &irq->nh);