| Message ID | 20221128105844.315bb58a@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm tree with Linus' tree | expand |
Hi DRm people, On Mon, Nov 28, 2022 at 1:02 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > > between commits: > > 3cb93f390453 ("drm/amdgpu: fix use-after-free during gpu recovery") > b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID") > > from Linus' tree and commits: > > 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS") > 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") > c5093cddf56b ("drm/amdgpu: drop the fence argument from amdgpu_vmid_grab") > 940ca22b7ea9 ("drm/amdgpu: drop amdgpu_sync from amdgpu_vmid_grab v2") > 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS") > 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") > > 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. Have you considered merging drm-fixes into drm-next, so not everyone who consumes your trees needs to resolve the same merge conflicts? Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index adac650cf544,032651a655f0..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_job.c between commits: 3cb93f390453 ("drm/amdgpu: fix use-after-free during gpu recovery") b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID") from Linus' tree and commits: 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS") 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") c5093cddf56b ("drm/amdgpu: drop the fence argument from amdgpu_vmid_grab") 940ca22b7ea9 ("drm/amdgpu: drop amdgpu_sync from amdgpu_vmid_grab v2") 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS") 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") 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.