linux-next: manual merge of the tip tree with Linus' tree

[Stephen Rothwell]

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:

  26a7993c93a7 ("net/mlx5: Use first online CPU instead of hard coded CPU")

from Linus' tree and commit:

  7451e9ea8e20 ("net/mlx5: Use irq_set_affinity_and_hint()")

from the tip 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/pci_irq.c
index 163e01fe500e,54fb67cec544..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
@@@ -398,8 -398,8 +398,8 @@@ irq_pool_request_vector(struct mlx5_irq
  	cpumask_copy(irq->mask, affinity);
  	if (!irq_pool_is_sf_pool(pool) && !pool->xa_num_irqs.max &&
  	    cpumask_empty(irq->mask))
 -		cpumask_set_cpu(0, irq->mask);
 +		cpumask_set_cpu(cpumask_first(cpu_online_mask), irq->mask);
- 	irq_set_affinity_hint(irq->irqn, irq->mask);
+ 	irq_set_affinity_and_hint(irq->irqn, irq->mask);
  unlock:
  	mutex_unlock(&pool->lock);
  	return irq;

Attachment: pgpsW25z1HUoc.pgp
Description: OpenPGP digital signature