Merge branch 'linus' into irq/core, to fix conflict

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc drivers/infiniband/hw/irdma/hw.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
index 54fb67c,bcee30f..fd7a671
--- 1/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
--- 2/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;