Hi all,
On Wed, 16 Jul 2025 14:23:22 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/etnaviv/etnaviv_sched.c
>
> between commit:
>
> 61ee19dedb8d ("drm/etnaviv: Protect the scheduler's pending list with its
> lock")
>
> from the origin tree and commits:
>
> 0a5dc1b67ef5 ("drm/sched: Rename DRM_GPU_SCHED_STAT_NOMINAL to
> DRM_GPU_SCHED_STAT_RESET")
> 8902c2b17a6e ("drm/etnaviv: Use DRM_GPU_SCHED_STAT_NO_HANG to skip the
> reset")
>
> from the drm-misc tree.
>
> I fixed it up (I used the latter version) 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.This is now a conflict between the drm tree and Linus' tree. -- Cheers, Stephen Rothwell
pgpHRsCFMS6Xj.pgp
Description: OpenPGP digital signature
