| Message ID | 20230119121307.4366ac4e@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-misc tree with Linus' tree | expand |
diff --cc drivers/gpu/drm/vmwgfx/ttm_object.h index 8098a3846bae,95a9679f9d39..000000000000 --- a/drivers/gpu/drm/vmwgfx/ttm_object.h
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vmwgfx/ttm_object.h between commit: a309c7194e8a ("drm/vmwgfx: Remove rcu locks from user resources") from Linus' tree and commit: 13acb368bf02 ("drm/ttm/vmwgfx: move ttm_bo_wait into VMWGFX") from the drm-misc tree. I fixed it up (see below) 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.