Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_pagemap.c
between commit:
754c232384386 ("drm/pagemap, drm/xe: Ensure that the devmem allocation is
idle before use")
from the origin tree and commits:
75af93b3f5d0a ("drm/pagemap, drm/xe: Support destination migration over
interconnect")
ec265e1f1cfcc ("drm/pagemap: Support source migration over interconnect")
3902846af36be ("drm/pagemap Fix error paths in drm_pagemap_migrate_to_devmem")
from the drm 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.
diff --cc drivers/gpu/drm/drm_pagemap.c
index 06c1bd8fc4d17,03ee39a761a41..0000000000000
--- a/drivers/gpu/drm/drm_pagemap.c
+++ b/drivers/gpu/drm/drm_pagemap.c
