Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 5516fb070344..5c155fa91eec 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -661,6 +661,9 @@ int ib_query_port(struct ib_device *device,
         if (err || port_attr->subnet_prefix)
                 return err;
 
+        if (rdma_port_get_link_layer(device, port_num) != IB_LINK_LAYER_INFINIBAND)
+                return 0;
+
         err = ib_query_gid(device, port_num, 0, &gid, NULL);
         if (err)
                 return err;
@@ -1024,7 +1027,8 @@ static int __init ib_core_init(void)
                 goto err_mad;
         }
 
-        if (ib_add_ibnl_clients()) {
+        ret = ib_add_ibnl_clients();
+        if (ret) {
                 pr_warn("Couldn't register ibnl clients\n");
                 goto err_sa;
         }