OSDN Git Service

Merge remote-tracking branch 'mlx5-next/mlx5-next' into HEAD
authorDoug Ledford <dledford@redhat.com>
Wed, 19 Jun 2019 02:44:36 +0000 (22:44 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 19 Jun 2019 02:44:36 +0000 (22:44 -0400)
commit12dbc04db08dc225b0e06cc5bb99c2dfa8236df9
tree37c45467a103aa428e05d63adf9660d547a04acb
parent7608bf40cf2480057ec0da31456cc428791c32ef
parent82b11f071936a11094e1c44730030cd3d894e0b4
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>
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/hw/mlx5/odp.c