Merge branch 'linus' into irq/core, to fix conflict
authorIngo Molnar <mingo@kernel.org>
Sat, 8 Jan 2022 09:53:57 +0000 (10:53 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 8 Jan 2022 09:53:57 +0000 (10:53 +0100)
commit0422fe2666aea4c0986f4c89dc107731aa6a7a81
tree1d42a146a738fb933f061424751755e630aeccb0
parent4b3ddc6462e83452182177b48c4bc53607acd68e
parentd1587f7bfe9a0f97a75d42ac1489aeda551106bc
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>
drivers/infiniband/hw/irdma/hw.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c