diff options
| author | Doug Ledford | 2019-06-18 22:44:36 -0400 |
|---|---|---|
| committer | Doug Ledford | 2019-06-18 22:44:36 -0400 |
| commit | 12dbc04db08dc225b0e06cc5bb99c2dfa8236df9 (patch) | |
| tree | 37c45467a103aa428e05d63adf9660d547a04acb /drivers/infiniband/hw/mlx5/mlx5_ib.h | |
| parent | 7608bf40cf2480057ec0da31456cc428791c32ef (diff) | |
| parent | 82b11f071936a11094e1c44730030cd3d894e0b4 (diff) | |
Merge remote-tracking branch 'mlx5-next/mlx5-next' into HEAD
Take mlx5-next so we can take a dependent two patch series next.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/mlx5_ib.h')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index f2ad0372d38d..35e2c8f5ae78 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -920,6 +920,7 @@ struct mlx5_ib_lb_state { }; struct mlx5_ib_pf_eq { + struct notifier_block irq_nb; struct mlx5_ib_dev *dev; struct mlx5_eq *core; struct work_struct work; |