linux-next: manual merge of the rdma tree with Linus' tree

From: Stephen Rothwell
Date: Wed Jun 19 2019 - 22:11:56 EST

Hi all,

Today's linux-next merge of the rdma tree got a conflict in:


between commit:

dc1435c00fcd ("RDMA/srp: Rename SRP sysfs name after IB device rename trigger")

from Linus' tree and commit:

0e2d00eb6fd4 ("RDMA: Add NLDEV_GET_CHARDEV to allow char dev discovery and autoload")

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell

diff --cc include/rdma/ib_verbs.h
index 54873085f2da,6f09fcc21d7a..000000000000
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@@ -2698,7 -2690,9 +2690,10 @@@ struct ib_client
const char *name;
void (*add) (struct ib_device *);
void (*remove)(struct ib_device *, void *client_data);
+ void (*rename)(struct ib_device *dev, void *client_data);
+ int (*get_nl_info)(struct ib_device *ibdev, void *client_data,
+ struct ib_client_nl_info *res);
+ int (*get_global_nl_info)(struct ib_client_nl_info *res);

/* Returns the net_dev belonging to this ib_client and matching the
* given parameters.

Attachment: pgpFapwrLvm6j.pgp
Description: OpenPGP digital signature