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@xxxxxxxxxxxxxxx on behalf of > > Bart > > Van Assche" <linux-rdma-owner@xxxxxxxxxxxxxxx on behalf of > > bart.vanassche@xxxxxxxxxxx> wrote: > > > > > > > > Prepare for removal of ib_device.dma_device. > > > > > > Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> > > > Cc: Moni Shoua <monis@xxxxxxxxxxxx> > > > --- > > > 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. -- Doug Ledford <dledford@xxxxxxxxxx> GPG KeyID: B826A3330E572FDD Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
Attachment:
signature.asc
Description: This is a digitally signed message part
