From: Doug Ledford <dledford@redhat.com>
Date: Thu, 10 Aug 2017 18:34:18 +0000 (-0400)
Subject: Merge branch 'rdma-netlink' into k.o/merge-test
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c
diff --cc include/rdma/ib_verbs.h
index 5ca3ac1e9113,e0e87a1f66fb..4db4ad56ace6
--- a/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 {