Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/uverbs_cmd.c between commit: 940efcc8889f ("RDMA/uverbs: Protect from attempts to create flows on unsupported QP") from the rdma-fixes tree and commit: e99028ad76e7 ("RDMA/uverbs: Check existence of create_flow callback") 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. -- Cheers, Stephen Rothwell diff --cc drivers/infiniband/core/uverbs_cmd.c index 87ffeebc0b28,5fc14fde274c..000000000000 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@@ -3559,11 -3554,11 +3554,16 @@@ int ib_uverbs_ex_create_flow(struct ib_ goto err_uobj; } + if (qp->qp_type != IB_QPT_UD && qp->qp_type != IB_QPT_RAW_PACKET) { + err = -EINVAL; + goto err_put; + } + + if (!qp->device->create_flow) { + err = -EOPNOTSUPP; + goto err_put; + } + flow_attr = kzalloc(struct_size(flow_attr, flows, cmd.flow_attr.num_of_specs), GFP_KERNEL); if (!flow_attr) {
Attachment:
pgpezSjl0jpnn.pgp
Description: OpenPGP digital signature