Hi Am 18.07.25 um 06:41 schrieb Stephen Rothwell:
Hi all,Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/virtio/virtgpu_prime.c between commit: 0ecfb8ddb953 ("Revert "drm/virtio: Use dma_buf from GEM object instance"") from the drm-misc-fixes tree and commit: 44b6535d8ace ("drm/virtio: Fix NULL pointer deref in virtgpu_dma_buf_free_obj()") from the drm tree. I fixed it up (I used the latter version - reverting the former by hand)
Sounds correct. You have to use dma buf from import_attach->dmabuf; not the one stored directly in the GEM object.
Best regards Thomas
and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
