Merge branch 'ip-roce' into for-next

Conflicts:
	drivers/infiniband/hw/mlx4/main.c

diff --cc drivers/infiniband/Kconfig
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/verbs.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
index ea5844e,bf218d9..c2702f5
--- 1/drivers/infiniband/hw/mlx4/main.c
--- 2/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@@ -2032,13 -1971,18 +2208,26 @@@ static void mlx4_ib_remove(struct mlx4_
                        pr_warn("failure unregistering notifier\n");
                ibdev->iboe.nb.notifier_call = NULL;
        }
 +
 +      if (ibdev->steering_support == MLX4_STEERING_MODE_DEVICE_MANAGED) {
 +              mlx4_qp_release_range(dev, ibdev->steer_qpn_base,
 +                                    ibdev->steer_qpn_count);
 +              kfree(ibdev->ib_uc_qpns_bitmap);
 +      }
 +
+       if (ibdev->iboe.nb_inet.notifier_call) {
+               if (unregister_inetaddr_notifier(&ibdev->iboe.nb_inet))
+                       pr_warn("failure unregistering notifier\n");
+               ibdev->iboe.nb_inet.notifier_call = NULL;
+       }
+ #if IS_ENABLED(CONFIG_IPV6)
+       if (ibdev->iboe.nb_inet6.notifier_call) {
+               if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6))
+                       pr_warn("failure unregistering notifier\n");
+               ibdev->iboe.nb_inet6.notifier_call = NULL;
+       }
+ #endif
++
        iounmap(ibdev->uar_map);
        for (p = 0; p < ibdev->num_ports; ++p)
                if (ibdev->counters[p] != -1)

diff --cc drivers/infiniband/hw/mlx4/mlx4_ib.h
Simple merge

diff --cc drivers/infiniband/hw/mlx4/qp.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_ah.c
Simple merge

diff --cc include/linux/mlx4/device.h
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge