| Message ID | 20241003110431.4bbfd467@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree | expand |
diff --cc drivers/gpu/drm/panthor/panthor_drv.c index c520f156e2d7,f9b93f84d611..000000000000 --- a/drivers/gpu/drm/panthor/panthor_drv.c
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/panthor/panthor_drv.c between commit: 2b55639a4e25 ("drm/panthor: Add FOP_UNSIGNED_OFFSET to fop_flags") from the drm-misc-fixes tree and commit: e16635d88fa0 ("drm/panthor: add DRM fdinfo support") 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.