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>
Loading
Please register or sign in to comment
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>