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)
Take mlx5-next so we can take a dependent two patch series next.

Signed-off-by: Doug Ledford <dledford@redhat.com>
1  2 
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/hw/mlx5/odp.c

Simple merge
Simple merge