On 2021/8/21 16:26, Wenpeng Liang wrote:

On 2021/8/21 2:48, Jason Gunthorpe wrote:

quoted

On Thu, Aug 19, 2021 at 09:36:17AM +0800, Wenpeng Liang wrote:

quoted

Use the ida interface to replace hns' own bitmap interface. The previous
ida patchset has replaced qp, cq, mr, pd, and xrcd. This ida patchset
will replace the remaining uar and srq. Since then, all replacements
have been completed.

Link to the previous ida patchset:
https://patchwork.kernel.org/project/linux-rdma/cover/1623325814-55737-1-git-send-email-liweihang@huawei.com/

Yangyang Li (3):
  RDMA/hns: Use IDA interface to manage uar index
  RDMA/hns: Use IDA interface to manage srq index
  RDMA/hns: Delete unused hns bitmap interface

It looks OK, but doesn't apply. Can you rebase it and resend? Looks
like it was based on the earlier hns patchset

Thanks,
Jason
.

I will rebase it and resend.

Thanks,
Wenpeng
.

Hi, Jason
If the jgg-rc-next branch has been revert the patchset
"RDMA/hns: Add support for Dynamic Context Attachment"
(Link:https://patchwork.kernel.org/project/linux-rdma/cover/1627525163-1683-1-git-send -email-liangwenpeng@huawei.com/),
then this patchset can be applied without conflicts, please try again.

Thanks,
Wenpeng