| Message ID | 20170120210437.26389-30-bart.vanassche@sandisk.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 1/20/17, 4:04 PM, "linux-rdma-owner@vger.kernel.org on behalf of Bart Van Assche" <linux-rdma-owner@vger.kernel.org on behalf of bart.vanassche@sandisk.com> wrote: >Prepare for removal of ib_device.dma_device. > >Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> >Cc: Moni Shoua <monis@mellanox.com> >--- > drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >@@ -1234,7 +1234,7 @@ int rxe_register_device(struct rxe_dev *rxe) > dev->node_type = RDMA_NODE_IB_CA; > dev->phys_port_cnt = 1; > dev->num_comp_vectors = RXE_NUM_COMP_VECTORS; >- dev->dma_device = rxe->ifc_ops->dma_device(rxe); >+ dev->dev.parent = rxe->ifc_ops->dma_device(rxe); > dev->local_dma_lkey = 0; > dev->node_guid = rxe->ifc_ops->node_guid(rxe); > dev->dma_ops = &rxe_dma_mapping_ops; ifc_ops was recently removed, so this will be a minor merge conflict. Reviewed-by: Andrew Boyer <andrew.boyer@dell.com> -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 2017-01-26 at 21:06 +0000, Boyer, Andrew wrote: > On 1/20/17, 4:04 PM, "linux-rdma-owner@vger.kernel.org on behalf of Bart > Van Assche" <linux-rdma-owner@vger.kernel.org on behalf of > bart.vanassche@sandisk.com> wrote: > > > Prepare for removal of ib_device.dma_device. > > > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > > Cc: Moni Shoua <monis@mellanox.com> > > --- > > drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > @@ -1234,7 +1234,7 @@ int rxe_register_device(struct rxe_dev *rxe) > > dev->node_type = RDMA_NODE_IB_CA; > > dev->phys_port_cnt = 1; > > dev->num_comp_vectors = RXE_NUM_COMP_VECTORS; > > - dev->dma_device = rxe->ifc_ops->dma_device(rxe); > > + dev->dev.parent = rxe->ifc_ops->dma_device(rxe); > > dev->local_dma_lkey = 0; > > dev->node_guid = rxe->ifc_ops->node_guid(rxe); > > dev->dma_ops = &rxe_dma_mapping_ops; > > ifc_ops was recently removed, so this will be a minor merge conflict. Hello Andrew, Thanks for the review. Doug, do you expect me to resolve this merge conflict by rebasing this patch series (something Linus doesn't like) once Linus has pulled your v4.11 pull request or are you going to explain to Linus how he should resolve this merge conflict himself? Thanks, Bart.-- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2017-01-27 at 22:14 +0000, Bart Van Assche wrote: > On Thu, 2017-01-26 at 21:06 +0000, Boyer, Andrew wrote: > > > > On 1/20/17, 4:04 PM, "linux-rdma-owner@vger.kernel.org on behalf of > > Bart > > Van Assche" <linux-rdma-owner@vger.kernel.org on behalf of > > bart.vanassche@sandisk.com> wrote: > > > > > > > > Prepare for removal of ib_device.dma_device. > > > > > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > > > Cc: Moni Shoua <monis@mellanox.com> > > > --- > > > drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > @@ -1234,7 +1234,7 @@ int rxe_register_device(struct rxe_dev > > > *rxe) > > > dev->node_type = RDMA_NODE_IB_CA; > > > dev->phys_port_cnt = 1; > > > dev->num_comp_vectors = RXE_NUM_COMP_VECTORS; > > > - dev->dma_device = rxe->ifc_ops->dma_device(rxe); > > > + dev->dev.parent = rxe->ifc_ops->dma_device(rxe); > > > dev->local_dma_lkey = 0; > > > dev->node_guid = rxe->ifc_ops->node_guid(rxe); > > > dev->dma_ops = &rxe_dma_mapping_ops; > > > > ifc_ops was recently removed, so this will be a minor merge > > conflict. > > Hello Andrew, > > Thanks for the review. > > Doug, do you expect me to resolve this merge conflict by rebasing > this > patch series (something Linus doesn't like) once Linus has pulled > your > v4.11 pull request or are you going to explain to Linus how he should > resolve this merge conflict himself? I'm going to do a local merge fixup run before I send it and will notify Linus of any fixes needed.
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index beb7021ff18a..b707fc3bca2a 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -168,7 +168,7 @@ static int rxe_query_pkey(struct ib_device *device, struct rxe_port *port; if (unlikely(port_num != 1)) { - dev_warn(device->dma_device, "invalid port_num = %d\n", + dev_warn(device->dev.parent, "invalid port_num = %d\n", port_num); goto err1; } @@ -176,7 +176,7 @@ static int rxe_query_pkey(struct ib_device *device, port = &rxe->port; if (unlikely(index >= port->attr.pkey_tbl_len)) { - dev_warn(device->dma_device, "invalid index = %d\n", + dev_warn(device->dev.parent, "invalid index = %d\n", index); goto err1; } @@ -1234,7 +1234,7 @@ int rxe_register_device(struct rxe_dev *rxe) dev->node_type = RDMA_NODE_IB_CA; dev->phys_port_cnt = 1; dev->num_comp_vectors = RXE_NUM_COMP_VECTORS; - dev->dma_device = rxe->ifc_ops->dma_device(rxe); + dev->dev.parent = rxe->ifc_ops->dma_device(rxe); dev->local_dma_lkey = 0; dev->node_guid = rxe->ifc_ops->node_guid(rxe); dev->dma_ops = &rxe_dma_mapping_ops;
Prepare for removal of ib_device.dma_device. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Moni Shoua <monis@mellanox.com> --- drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)