Re: linux-next: build failure after merge of the drm tree

[Jacob Moroni]

Reviewed-by: Jacob Moroni <jmoroni@xxxxxxxxxx>

On Tue, Mar 10, 2026 at 11:25 AM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Hi all,
>
> After merging the drm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/drivers/infiniband/core/umem_dmabuf.c:210:10: error: 'struct dma_buf_attach_ops' has no member named 'move_notify'
>   210 |         .move_notify = ib_umem_dmabuf_revoke_locked,
>       |          ^~~~~~~~~~~
>
>
> Caused by commit
>
>   932f1eef09ecb (RDMA/umem: Add pinned revocable dmabuf import interface)
>
> from the rdma tree interacting with commit
>
>   ef246da8e63c4 (dma-buf: Rename .move_notify() callback to a clearer identifier)
>
> from the drm tree.  I have fixed this up as below and can carry as
> required.
>
> commit 0cab8756cbc2f43cec2b8e88f2ea3c985491a426
> Author: Mark Brown <broonie@xxxxxxxxxx>
> Date:   Tue Mar 10 15:15:19 2026 +0000
>
>     drm/rdma: Fix up merge
>
>     /tmp/next/build/drivers/infiniband/core/umem_dmabuf.c:210:10: error: 'struct dma_buf_attach_ops' has no member named 'move_notify'
>       210 |         .move_notify = ib_umem_dmabuf_revoke_locked,
>           |          ^~~~~~~~~~~
>     make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drive
>
>     Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
>
> diff --git a/drivers/infiniband/core/umem_dmabuf.c b/drivers/infiniband/core/umem_dmabuf.c
> index d7ade877bf9d1..ad023c2d84d85 100644
> --- a/drivers/infiniband/core/umem_dmabuf.c
> +++ b/drivers/infiniband/core/umem_dmabuf.c
> @@ -207,7 +207,7 @@ static void ib_umem_dmabuf_revoke_locked(struct dma_buf_attachment *attach)
>
>  static struct dma_buf_attach_ops ib_umem_dmabuf_attach_pinned_revocable_ops = {
>         .allow_peer2peer = true,
> -       .move_notify = ib_umem_dmabuf_revoke_locked,
> +       .invalidate_mappings = ib_umem_dmabuf_revoke_locked,
>  };
>
>  static struct ib_umem_dmabuf *