Merge branch 'rdma-netlink' into k.o/merge-test

Conflicts:
	include/rdma/ib_verbs.h - Modified a function signature adjacent
	to a newly added function signature from a previous merge

Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --cc drivers/infiniband/core/core_priv.h
Simple merge

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

diff --cc include/rdma/ib_verbs.h
index 5ca3ac1,e0e87a1..4db4ad5
--- 1/include/rdma/ib_verbs.h
--- 2/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@@ -2305,9 -2309,7 +2309,9 @@@ struct ib_device 
         * in fast paths.
         */
        int (*get_port_immutable)(struct ib_device *, u8, struct ib_port_immutable *);
-       void (*get_dev_fw_str)(struct ib_device *, char *str, size_t str_len);
+       void (*get_dev_fw_str)(struct ib_device *, char *str);
 +      const struct cpumask *(*get_vector_affinity)(struct ib_device *ibdev,
 +                                                   int comp_vector);
  };
  
  struct ib_client {