Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

[Stephen Rothwell]

Hi Zhu,

On Thu, 6 Mar 2025 11:19:24 +0100 Zhu Yanjun <yanjun.zhu@xxxxxxxxx> wrote:
>
> >    	rxe->max_ucontext			= RXE_MAX_UCONTEXT;
> > +
> > + 	if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING)) {
> > + 		rxe->attr.kernel_cap_flags |= IBK_ON_DEMAND_PAGING;
> > +
> > + 		/* IB_ODP_SUPPORT_IMPLICIT is not supported right now. */
> > + 		rxe->attr.odp_caps.general_caps |= IB_ODP_SUPPORT;
> > +
> > + 		rxe->attr.odp_caps.per_transport_caps.ud_odp_caps |= IB_ODP_SUPPORT_SEND;
> > + 		rxe->attr.odp_caps.per_transport_caps.ud_odp_caps |= IB_ODP_SUPPORT_RECV;
> > + 		rxe->attr.odp_caps.per_transport_caps.ud_odp_caps |= IB_ODP_SUPPORT_SRQ_RECV;
> > +
> > + 		rxe->attr.odp_caps.per_transport_caps.rc_odp_caps |= IB_ODP_SUPPORT_SEND;
> > + 		rxe->attr.odp_caps.per_transport_caps.rc_odp_caps |= IB_ODP_SUPPORT_RECV;
> > + 		rxe->attr.odp_caps.per_transport_caps.rc_odp_caps |= IB_ODP_SUPPORT_WRITE;
> > + 		rxe->attr.odp_caps.per_transport_caps.rc_odp_caps |= IB_ODP_SUPPORT_READ;
> > + 		rxe->attr.odp_caps.per_transport_caps.rc_odp_caps |= IB_ODP_SUPPORT_ATOMIC;
> > + 		rxe->attr.odp_caps.per_transport_caps.rc_odp_caps |= IB_ODP_SUPPORT_SRQ_RECV;
> > + 	}
> >    }  
> 
> The above snippet is from on_demand paging commits. I do not why it is involved in this commit.
> 
> It should appear in on_demand_paging patchset.

That is not part of the conflict, but the change is there on one side
of the merge.

> >    /* initialize port attributes */
> > @@@ -107,13 -141,18 +133,13 @@@ static void rxe_init_port_param(struct
> >    /* initialize port state, note IB convention that HCA ports are always
> >     * numbered from 1
> >     */
> >   -static void rxe_init_ports(struct rxe_dev *rxe)
> >   +static void rxe_init_ports(struct rxe_dev *rxe, struct net_device *ndev)  
> 
> In this snippet, the variable "struct net_device *ndev" is not used in the function rxe_init_ports, it should be removed.

I have added that to my resolution.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpDJ4u2dNwLW.pgp
Description: OpenPGP digital signature