linux-next: build failure after merge of the drm-misc tree
Subsystems (2)
Mark Brown
maintainerHi all,
After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this:
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
| ^~~~~~~~~~~~~~~~~~~make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/ib_core_uverbs.o] Error 1
make[6]: *** Waiting for unfinished jobs..../tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c: In function 'uverbs_dmabuf_fd_destroy_uobj':/tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c:170:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
170 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
| ^~~~~~~~~~~~~~~~~~~make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/uverbs_std_types_dmabuf.o] Error 1
Caused by commit
95308225e5bae (dma-buf: Rename dma_buf_move_notify() to dma_buf_invalidate_mappings())
interacting with
0ac6f4056c4a2 (RDMA/uverbs: Add DMABUF object type and operations)
from Linus' tree. I have fixed this up as below and can carry as needed.
From 89e7d4987e08a46f2db151cebba258a1bc01d628 Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Mon, 23 Feb 2026 18:27:51 +0000
Subject: [PATCH] RDMA/uverbs: Update for semantic conflict with drm-misc
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
| ^~~~~~~~~~~~~~~~~~~--- drivers/infiniband/core/ib_core_uverbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/ib_core_uverbs.c +1 -1
@@ -246,7 +246,7 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry)dma_resv_lock (uverbs_dmabuf->dmabuf->resv,NULL );list_del (&uverbs_dmabuf->dmabufs_elm); uverbs_dmabuf->revoked = true; -dma_buf_move_notify (uverbs_dmabuf->dmabuf); +dma_buf_invalidate_mappings (uverbs_dmabuf->dmabuf);dma_resv_wait_timeout (uverbs_dmabuf->dmabuf->resv,DMA_RESV_USAGE_BOOKKEEP , false,MAX_SCHEDULE_TIMEOUT );
drivers/infiniband/core/uverbs_std_types_dmabuf.c +1 -1
@@ -167,7 +167,7 @@ static void uverbs_dmabuf_fd_destroy_uobj(struct ib_uobject *uobj,if (!uverbs_dmabuf->revoked) { uverbs_dmabuf->revoked = true;list_del (&uverbs_dmabuf->dmabufs_elm); -dma_buf_move_notify (uverbs_dmabuf->dmabuf); +dma_buf_invalidate_mappings (uverbs_dmabuf->dmabuf);dma_resv_wait_timeout (uverbs_dmabuf->dmabuf->resv,DMA_RESV_USAGE_BOOKKEEP , false,MAX_SCHEDULE_TIMEOUT );
Signature · 1 line
2.47.3
Patchwork
CI✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details ==
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/162003/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/162003/revisions/1/mbox/ not applied Patch is empty.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To record the empty patch as an empty commit, run "git am --allow-empty".
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced
Leon Romanovsky
maintainerQuoted 35 lines · Mark Brown
Hi all,
After merging the drm-misc tree, today's linux-next build (
x86_64allmodconfig) failed like this:
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf); | ^~~~~~~~~~~~~~~~~~~make[6]: *** [
/tmp/next/build/scripts/Makefile.build:289:drivers/infiniband/core/ib_core_uverbs.o] Error 1
make[6]: *** Waiting for unfinished jobs..../tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c: In function 'uverbs_dmabuf_fd_destroy_uobj':/tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c:170:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]170 | dma_buf_move_notify(uverbs_dmabuf->dmabuf); | ^~~~~~~~~~~~~~~~~~~make[6]: *** [
/tmp/next/build/scripts/Makefile.build:289:drivers/infiniband/core/uverbs_std_types_dmabuf.o] Error 1Caused by commit
95308225e5bae(dma-buf: Renamedma_buf_move_notify()todma_buf_invalidate_mappings())interacting with
0ac6f4056c4a2(RDMA/uverbs: Add DMABUF object type and operations)from Linus' tree. I have fixed this up as below and can carry as needed.
From
89e7d4987e08a46f2db151cebba258a1bc01d628Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Mon, 23 Feb 2026 18:27:51 +0000
Subject: [PATCH] RDMA/uverbs: Update for semantic conflict with drm-misc
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
Quoted 7 lines
249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf); | ^~~~~~~~~~~~~~~~~~~Signed-off-by Mark Brown <[email protected]>--- drivers/infiniband/core/ib_core_uverbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
The change is correct. The dma_buf_move_notify->dma_buf_invalidate_mappings rename was merged to DRM tree before merge window and ib_core_uverbs change was brought during merge window from RDMA tree.
Christian,
You should take this fix to your tree. RDMA tree doesn't have rename patches yet.
Thanks
Quoted 31 lines
drivers/infiniband/core/ib_core_uverbs.c +1
-1@@ -246,7 +246,7 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry)dma_resv_lock (uverbs_dmabuf->dmabuf->resv,NULL );list_del (&uverbs_dmabuf->dmabufs_elm); uverbs_dmabuf->revoked = true; -dma_buf_move_notify (uverbs_dmabuf->dmabuf); +dma_buf_invalidate_mappings (uverbs_dmabuf->dmabuf);dma_resv_wait_timeout (uverbs_dmabuf->dmabuf->resv,DMA_RESV_USAGE_BOOKKEEP , false,MAX_SCHEDULE_TIMEOUT );drivers/infiniband/core/uverbs_std_types_dmabuf.c +1
-1@@ -167,7 +167,7 @@ static void uverbs_dmabuf_fd_destroy_uobj(struct ib_uobject *uobj,if (!uverbs_dmabuf->revoked) { uverbs_dmabuf->revoked = true;list_del (&uverbs_dmabuf->dmabufs_elm); -dma_buf_move_notify (uverbs_dmabuf->dmabuf); +dma_buf_invalidate_mappings (uverbs_dmabuf->dmabuf);dma_resv_wait_timeout (uverbs_dmabuf->dmabuf->resv,DMA_RESV_USAGE_BOOKKEEP , false,MAX_SCHEDULE_TIMEOUT );Signature · 2 lines
-- 2.47.3
Quoted 49 lines · Leon Romanovsky
Quoted 35 lines · Mark Brown
Hi all,
After merging the drm-misc tree, today's linux-next build (
x86_64allmodconfig) failed like this:
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf); | ^~~~~~~~~~~~~~~~~~~make[6]: *** [
/tmp/next/build/scripts/Makefile.build:289:drivers/infiniband/core/ib_core_uverbs.o] Error 1
make[6]: *** Waiting for unfinished jobs..../tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c: In function 'uverbs_dmabuf_fd_destroy_uobj':/tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c:170:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]170 | dma_buf_move_notify(uverbs_dmabuf->dmabuf); | ^~~~~~~~~~~~~~~~~~~make[6]: *** [
/tmp/next/build/scripts/Makefile.build:289:drivers/infiniband/core/uverbs_std_types_dmabuf.o] Error 1Caused by commit
95308225e5bae(dma-buf: Renamedma_buf_move_notify()todma_buf_invalidate_mappings())interacting with
0ac6f4056c4a2(RDMA/uverbs: Add DMABUF object type and operations)from Linus' tree. I have fixed this up as below and can carry as needed.
From
89e7d4987e08a46f2db151cebba258a1bc01d628Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Mon, 23 Feb 2026 18:27:51 +0000
Subject: [PATCH] RDMA/uverbs: Update for semantic conflict with drm-misc
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]Quoted 7 lines
249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf); | ^~~~~~~~~~~~~~~~~~~Signed-off-by Mark Brown <[email protected]>--- drivers/infiniband/core/ib_core_uverbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)The change is correct. The
dma_buf_move_notify->dma_buf_invalidate_mappingsrename was merged to DRM tree before merge window andib_core_uverbschange was brought during merge window from RDMA tree.
Quoted 4 lines
Christian,
You should take this fix to your tree. RDMA tree doesn't have rename patches yet.
Done.
Regards,
Christian.
Quoted 36 lines
Thanks
Quoted 31 lines
drivers/infiniband/core/ib_core_uverbs.c +1
-1@@ -246,7 +246,7 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry)dma_resv_lock (uverbs_dmabuf->dmabuf->resv,NULL );list_del (&uverbs_dmabuf->dmabufs_elm); uverbs_dmabuf->revoked = true; -dma_buf_move_notify (uverbs_dmabuf->dmabuf); +dma_buf_invalidate_mappings (uverbs_dmabuf->dmabuf);dma_resv_wait_timeout (uverbs_dmabuf->dmabuf->resv,DMA_RESV_USAGE_BOOKKEEP , false,MAX_SCHEDULE_TIMEOUT );drivers/infiniband/core/uverbs_std_types_dmabuf.c +1
-1@@ -167,7 +167,7 @@ static void uverbs_dmabuf_fd_destroy_uobj(struct ib_uobject *uobj,if (!uverbs_dmabuf->revoked) { uverbs_dmabuf->revoked = true;list_del (&uverbs_dmabuf->dmabufs_elm); -dma_buf_move_notify (uverbs_dmabuf->dmabuf); +dma_buf_invalidate_mappings (uverbs_dmabuf->dmabuf);dma_resv_wait_timeout (uverbs_dmabuf->dmabuf->resv,DMA_RESV_USAGE_BOOKKEEP , false,MAX_SCHEDULE_TIMEOUT );Signature · 2 lines
-- 2.47.3