linux-next: manual merge of the mm tree with the drm tree

2023-01-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the mm tree got a conflict in: drivers/gpu/drm/i810/i810_dma.c between commit: cab18866fead ("drm: Remove the obsolete driver-i810") from the drm tree and commit: 6fe0afd07701 ("mm: replace vma->vm_flags direct modifications with modifier calls") fr

linux-next: manual merge of the mm tree with the drm tree

2022-10-04 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the mm tree got a conflict in: drivers/gpu/drm/amd/amdkfd/kfd_migrate.c between commit: 3a876060892b ("drm/amdkfd: Migrate in CPU page fault use current mm") from the drm tree and commit: c5f45c35acc4 ("mm/memory.c: fix race when faulting a device pri